Merge remote-tracking branch 'origin/master'

src/main/Main.java

@@ -99,18 +99,17 @@ public class Main extends ListenerAdapter
 			
 			if(pluginOutput != null && pluginOutput.size() > 0)
 			{
-					for(int i = 0; i < pluginOutput.size(); ++i)
+				for(int i = 0; i < pluginOutput.size(); ++i)
+				{
+					if(pluginOutput.get(i).startsWith("!"))
 					{
-						if(pluginOutput.get(i).startsWith("!"))
-						{
-							commandManager.InvokeOnNewThread(guild, channel, user, new UserInput(pluginOutput.get(i).substring(1), guild), response);
-						}
-						else
-						{
-							response.Call(pluginOutput.get(i));
-						}
+						commandManager.InvokeOnNewThread(guild, channel, user, new UserInput(pluginOutput.get(i).substring(1), guild), response);
 					}
-								
+					else
+					{
+						response.Call(pluginOutput.get(i));
+					}
+				}
 			}
 		}
 		

src/main/Superintendent.java

@@ -92,7 +92,7 @@ public class Superintendent
 		// Upkeep database lazily on occasion
 		if(delayTimerCurrent.decrementAndGet() < 0)
 		{
-			databaseManager.Upkeep();
+			databaseManager.upkeep();
 			delayTimerCurrent.set(delayTimerReset);
 		}