Fixed a few issues from the merge, added the mod directory to the zip

backup.

src/main/java/com/gmail/nossr50/runnables/SQLConversionTask.java

@@ -17,7 +17,7 @@ public class SQLConversionTask implements Runnable {
 
     @Override
     public void run() {
-        String location = mcMMO.p.usersFile;
+        String location = plugin.usersFile;
 
         try {
             FileReader file = new FileReader(location);