diff --git a/pom.xml b/pom.xml
index f922feabd..542abb173 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,9 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.intellectualcrafters</groupId>
-	<properties>
-	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
     <artifactId>PlotSquared</artifactId>
     <version>2.12.19</version>
     <name>PlotSquared</name>
@@ -16,55 +16,58 @@
         <sourceDirectory>src/main/java</sourceDirectory>
         <resources>
             <resource>
-               <filtering>true</filtering>
-               <excludes>
-		          <exclude>skyblock.template</exclude>
-		          <exclude>town.template</exclude>
-		      </excludes>
-               <directory>${basedir}/src/main/resources/</directory>
+                <filtering>true</filtering>
+                <excludes>
+                    <exclude>skyblock.template</exclude>
+                    <exclude>town.template</exclude>
+                </excludes>
+                <directory>${basedir}/src/main/resources/</directory>
             </resource>
             <resource>
-               <filtering>false</filtering>
-               <includes>
-		          <include>skyblock.template</include>
-		          <include>town.template</include>
-		          <include>s_chinese.yml</include>
-		          <include>s_chinese_unescaped.yml</include>
-		          <include>german.yml</include>
-		          <include>italian.yml</include>
-		      </includes>
-               <directory>${basedir}/src/main/resources/</directory>
+                <filtering>false</filtering>
+                <includes>
+                    <include>skyblock.template</include>
+                    <include>town.template</include>
+                    <include>s_chinese.yml</include>
+                    <include>s_chinese_unescaped.yml</include>
+                    <include>german.yml</include>
+                    <include>italian.yml</include>
+                </includes>
+                <directory>${basedir}/src/main/resources/</directory>
             </resource>
         </resources>
         <plugins>
- 	       
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-			    	<executions>
-			  	        <execution>
-				            <id>bukkit</id>
-				            <goals><goal>jar</goal></goals>
-				            <phase>package</phase>
-				            <configuration>
-				            	<classifier>bukkit</classifier>
-				            	<excludes>
-								<exclude>**/com/plotsquared/sponge/*</exclude>
-		              			</excludes>
-		            		</configuration>
-		          		</execution>
-		          		<execution>
-		            		<id>sponge</id>
-		            		<goals><goal>jar</goal></goals>
-		            		<phase>package</phase>
-		            		<configuration>
-			              		<classifier>sponge</classifier>
-				            	<excludes>
-								<exclude>**/com/plotsquared/bukkit/*</exclude>
-		              			</excludes>
-            				</configuration>
-        				</execution>
-       				</executions>
-      		</plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>bukkit</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <finalName>PlotSquared-Bukkit</finalName>
+                            <excludes>
+                                <exclude>**/com/plotsquared/sponge/*</exclude>
+                            </excludes>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>sponge</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <finalName>PlotSquared-Sponge</finalName>
+                            <excludes>
+                                <exclude>**/com/plotsquared/bukkit/*</exclude>
+                            </excludes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
@@ -73,19 +76,20 @@
                     <target>1.7</target>
                 </configuration>
             </plugin>
-	      	<plugin>
-	        	<groupId>org.apache.maven.plugins</groupId>
-	        	<artifactId>maven-javadoc-plugin</artifactId>
-	        	<version>2.10.3</version>
-	        	<configuration>
-	          		<additionalparam>-Xdoclint:none</additionalparam>
-	        	</configuration>
-	      	</plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.3</version>
+                <configuration>
+                    <additionalparam>-Xdoclint:none</additionalparam>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <repositories>
         <repository>
-            <id>techcable-repo</id> <!-- Just leave the repositories section alone or bukkit won't work -->
+            <id>techcable-repo</id>
+            <!-- Just leave the repositories section alone or bukkit won't work -->
             <url>http://repo.techcable.net/content/groups/public/</url>
         </repository>
         <repository>
@@ -95,7 +99,7 @@
         <repository>
             <id>spigot-repo</id>
             <url>http://hub.spigotmc.org/nexus/content/groups/public/</url>
-		</repository>
+        </repository>
         <repository>
             <id>confuser-repo</id>
             <url>http://ci.frostcast.net/plugin/repository/everything</url>
@@ -109,33 +113,33 @@
             <url>http://nexus.theyeticave.net/content/repositories/pub_releases</url>
         </repository>
         <repository>
-	        <id>sponge-maven-repo</id>
-	        <name>Sponge maven repo</name>
-	        <url>http://repo.spongepowered.org/maven</url>
-	        <releases>
-	            <enabled>true</enabled>
-	        </releases>
-	        <snapshots>
-	            <enabled>true</enabled>
-	        </snapshots>
-	    </repository>
+            <id>sponge-maven-repo</id>
+            <name>Sponge maven repo</name>
+            <url>http://repo.spongepowered.org/maven</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
     </repositories>
     <dependencies>
-	    <dependency>
-			<groupId>javax.websocket</groupId>
-			<artifactId>javax.websocket-api</artifactId>
-			<version>1.1</version>
-		</dependency>
-	    <dependency>
-	        <groupId>org.spongepowered</groupId>
-	        <artifactId>spongeapi</artifactId>
-	        <version>2.1-20150716.174735-128</version>
-	    </dependency>
-    	<dependency>
+        <dependency>
+            <groupId>javax.websocket</groupId>
+            <artifactId>javax.websocket-api</artifactId>
+            <version>1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.spongepowered</groupId>
+            <artifactId>spongeapi</artifactId>
+            <version>2.1-20150716.174735-128</version>
+        </dependency>
+        <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
             <version>1.8.3-R0.1-SNAPSHOT</version>
-		</dependency>
+        </dependency>
         <dependency>
             <groupId>com.sk89q</groupId>
             <artifactId>worldedit</artifactId>
@@ -149,15 +153,15 @@
             <version>2.0</version>
         </dependency>
         <dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-math3</artifactId>
-			<version>3.2</version>
-		</dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-math3</artifactId>
+            <version>3.2</version>
+        </dependency>
         <dependency>
-		   <groupId>junit</groupId>
-		   <artifactId>junit</artifactId>
-		   <version>4.11</version>
-		</dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+        </dependency>
         <dependency>
             <groupId>net.milkbowl.vault</groupId>
             <artifactId>VaultAPI</artifactId>