diff --git a/.travis.yml b/.travis.yml
index 2ad8a664..14a4ccf3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,11 @@
+sudo: false
+
 language: java
-jdk:
-  - oraclejdk7
-script: "mvn clean install"
+jdk: oraclejdk7
+
+cache:
+  directories:
+    - '$HOME/.m2/repository'
+
+script:
+  - mvn clean install -B && mvn clean -B
diff --git a/pom.xml b/pom.xml
index 6c3591dd..30d9b666 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,46 +2,77 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	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>fr.xephi.authme.AuthMe</groupId>
 	<artifactId>AuthMe</artifactId>
 	<version>5.0-SNAPSHOT</version>
-
+	
 	<name>AuthMeReloaded</name>
 	<description>Authentication plugin for CraftBukkit/Spigot!</description>
 	<url>http://dev.bukkit.org/bukkit-plugins/authme-reloaded/</url>
-
+	
 	<packaging>jar</packaging>
-
+	
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
+		
 		<!-- Change Compiler Version (JDK) HERE! -->
 		<maven.compiler.source>1.7</maven.compiler.source>
 		<maven.compiler.target>1.7</maven.compiler.target>
-
+		
 		<!-- Change MC Version HERE! -->
 		<bukkitVersion>1.8.7-R0.1-SNAPSHOT</bukkitVersion>
-
+		
 		<mainClass>${project.groupId}.${project.artifactId}</mainClass>
 	</properties>
-
+	
 	<!-- Official Build Server ALLERT: sometimes jenkins is offline, no panic! -->
 	<ciManagement>
 		<system>jenkins</system>
 		<url>http://ci.xephi.fr</url>
 	</ciManagement>
-
+	
 	<issueManagement>
 		<system>GitHub</system>
 		<url>https://github.com/Xephi/AuthMeReloaded/issues</url>
 	</issueManagement>
-
+	
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.3</version>
+				<configuration>
+					<source>${maven.compiler.source}</source>
+					<target>${maven.compiler.target}</target>
+				</configuration>
+			</plugin>
+			<!-- <plugin>
+				<groupId>com.google.code.maven-replacer-plugin</groupId>
+				<artifactId>maven-replacer-plugin</artifactId>
+				<version>1.4.1</version>
+				<executions>
+					<execution>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>replace</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<file>target/classes/plugin.yml</file>
+					<replacements>
+						<replacement>
+							<token>${version}</token>
+							<value>${version}</value>
+						</replacement>
+					</replacements>
+				</configuration>
+			</plugin> -->
 			<plugin>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.5</version>
+				<version>2.6</version>
 				<configuration>
 					<archive>
 						<manifestFile>${manifest.file}</manifestFile>
@@ -49,54 +80,53 @@
 				</configuration>
 			</plugin>
 		</plugins>
-
 	</build>
-
+	
 	<repositories>
-
+		
 		<!-- SpigotMC Repo (Bukkit and SpigotAPI) -->
 		<repository>
 			<id>spigot-repo</id>
 			<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
 		</repository>
-
+		
 		<!-- Vault Repo -->
 		<repository>
 			<id>vault-repo</id>
 			<url>http://nexus.theyeticave.net/content/repositories/pub_releases</url>
 		</repository>
-
+		
 		<!-- Citizens 2.X Repo -->
 		<repository>
 			<id>everything</id>
 			<url>http://repo.citizensnpcs.co</url>
 		</repository>
-
+		
 		<!-- EssentialsX Repo -->
 		<repository>
 			<id>ess-repo</id>
 			<url>http://repo.ess3.net/content/groups/public</url>
 		</repository>
-
+		
 		<!-- CombatTagPlus Repo -->
 		<repository>
 			<id>minelink-thirdparty</id>
 			<url>http://repo.minelink.net/content/repositories/public</url>
 		</repository>
-
+		
 		<!-- CombatTag Repo, Unofficial (needs replacement) -->
 		<repository>
 			<id>techcable-repo</id>
 			<url>http://repo.techcable.net/content/repositories/snapshots/</url>
 		</repository>
-
+		
 		<!-- XAuth Repo -->
 		<repository>
 			<id>bukkit-plugins-releases</id>
 			<name>repo.luricos.de releases</name>
 			<url>http://repo.luricos.de/content/repositories/releases/</url>
 		</repository>
-
+		
 		<!-- SpoutCraft Repo -->
 		<repository>
 			<id>sonatype-nexus-releases</id>
@@ -105,53 +135,53 @@
 		<repository>
 			<id>sonatype-nexus-snapshots</id>
 			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-			<snapshots>
+			<!-- <snapshots>
 				<enabled>true</enabled>
 				<updatePolicy>always</updatePolicy>
-			</snapshots>
+			</snapshots> -->
 		</repository>
 		<!-- End of Spout Repo -->
-
+		
 		<!-- Attribute Repo -->
 		<repository>
 			<id>comphenix-snapshots</id>
 			<name>Comphenix Maven Snapshots</name>
 			<url>http://repo.comphenix.net/content/repositories/snapshots/</url>
 		</repository>
-
+		
 		<!-- Multiverse Repo -->
 		<repository>
 			<id>onarandombox</id>
 			<url>http://repo.onarandombox.com/content/groups/public</url>
 		</repository>
-
+		
 	</repositories>
-
+	
 	<dependencies>
-
+		
 		<!-- Maven Dependencies -->
-
+		
 		<!-- MySql Library -->
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 			<version>5.1.35</version>
 		</dependency>
-
+		
 		<!-- SQLite Library -->
 		<dependency>
 			<groupId>org.xerial</groupId>
 			<artifactId>sqlite-jdbc</artifactId>
 			<version>3.8.10.1</version>
 		</dependency>
-
+		
 		<!-- Database Library -->
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
 			<version>1.4.187</version>
 		</dependency>
-
+		
 		<!-- Java Email API -->
 		<dependency>
 			<groupId>com.sun.mail</groupId>
@@ -170,7 +200,15 @@
 			<artifactId>geoip-api</artifactId>
 			<version>1.2.14</version>
 		</dependency>
-
+		
+		<!-- Spigot-Api, http://www.spigotmc.org/ Based on the Bukkit project, 
+			http://bukkit.org/ -->
+		<dependency>
+			<groupId>org.spigotmc</groupId>
+			<artifactId>spigot-api</artifactId>
+			<version>${bukkitVersion}</version>
+		</dependency>
+		
 		<dependency>
 			<groupId>com.comphenix.attribute</groupId>
 			<artifactId>AttributeStorage</artifactId>
@@ -180,50 +218,47 @@
 					<groupId>org.bukkit</groupId>
 					<artifactId>bukkit</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.bukkit</groupId>
+					<artifactId>craftbukkit</artifactId>
+				</exclusion>
 			</exclusions> 
 		</dependency>
-
-
-		<!-- Spigot-Api, http://www.spigotmc.org/ Based on the Bukkit project, 
-			http://bukkit.org/ -->
-		<dependency>
-			<groupId>org.spigotmc</groupId>
-			<artifactId>spigot-api</artifactId>
-			<version>${bukkitVersion}</version>
-		</dependency>
-
+		
 		<!-- Vault, http://dev.bukkit.org/bukkit-plugins/vault/ -->
 		<dependency>
 			<groupId>net.milkbowl.vault</groupId>
 			<artifactId>Vault</artifactId>
 			<version>1.5.4</version>
-			<scope>provided</scope>
 			<exclusions>
 				<exclusion>
 					<groupId>org.bukkit</groupId>
 					<artifactId>bukkit</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.bukkit</groupId>
+					<artifactId>craftbukkit</artifactId>
+				</exclusion>
 			</exclusions> 
 		</dependency>
-
+		
 		<!-- Citizens 2.X, NPC plugin, http://dev.bukkit.org/bukkit-plugins/citizens/ -->
 		<dependency>
 			<groupId>net.citizensnpcs</groupId>
 			<artifactId>citizensapi</artifactId>
 			<version>2.0.16-SNAPSHOT</version>
-			<scope>provided</scope>
 			<exclusions>
 				<exclusion>
 					<groupId>org.bukkit</groupId>
 					<artifactId>bukkit</artifactId>
 				</exclusion>
 				<exclusion>
-					<groupId>net.milkbowl.vault</groupId>
-					<artifactId>Vault</artifactId>
+					<groupId>org.bukkit</groupId>
+					<artifactId>craftbukkit</artifactId>
 				</exclusion>
 			</exclusions> 
 		</dependency>
-
+		
 		<!-- Multi World plugin, http://www.spigotmc.org/resources/multiverse-core.390/ -->
 		<dependency>
 			<groupId>com.onarandombox.multiversecore</groupId>
@@ -237,12 +272,12 @@
 					<artifactId>bukkit</artifactId>
 				</exclusion>
 				<exclusion>
-					<groupId>net.milkbowl.vault</groupId>
-					<artifactId>Vault</artifactId>
+					<groupId>org.bukkit</groupId>
+					<artifactId>craftbukkit</artifactId>
 				</exclusion>
 			</exclusions> 
 		</dependency>
-
+		
 		<!-- Essentials plugin -->
 		<dependency>
 			<groupId>net.ess3</groupId>
@@ -254,12 +289,12 @@
 					<artifactId>bukkit</artifactId>
 				</exclusion>
 				<exclusion>
-					<groupId>net.milkbowl.vault</groupId>
-					<artifactId>Vault</artifactId>
+					<groupId>org.bukkit</groupId>
+					<artifactId>craftbukkit</artifactId>
 				</exclusion>
 			</exclusions> 
 		</dependency>
-
+		
 		<!-- Anti PvPLogging plugin, https://github.com/MinelinkNetwork/CombatTagPlus -->
 		<dependency>
 			<groupId>net.minelink</groupId>
@@ -270,9 +305,13 @@
 					<groupId>org.bukkit</groupId>
 					<artifactId>bukkit</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.bukkit</groupId>
+					<artifactId>craftbukkit</artifactId>
+				</exclusion>
 			</exclusions> 
 		</dependency>
-
+		
 		<!-- Anti PvPLogging plugin, http://www.spigotmc.org/resources/combat-tag.3182/ -->
 		<dependency>
 			<groupId>com.trc202</groupId>
@@ -283,9 +322,13 @@
 					<groupId>org.bukkit</groupId>
 					<artifactId>bukkit</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.bukkit</groupId>
+					<artifactId>craftbukkit</artifactId>
+				</exclusion>
 			</exclusions> 
 		</dependency>
-
+		
 		<!-- XAuth, another authentication plugin, required by the database converter -->
 		<dependency>
 			<groupId>de.luricos.bukkit</groupId>
@@ -296,9 +339,13 @@
 					<groupId>org.bukkit</groupId>
 					<artifactId>bukkit</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.bukkit</groupId>
+					<artifactId>craftbukkit</artifactId>
+				</exclusion>
 			</exclusions> 
 		</dependency>
-
+		
 		<!-- Spout API, https://spoutcraft.org/downloads/ -->
 		<dependency>
 			<groupId>org.spoutcraft</groupId>
@@ -309,11 +356,15 @@
 					<groupId>org.bukkit</groupId>
 					<artifactId>bukkit</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.bukkit</groupId>
+					<artifactId>craftbukkit</artifactId>
+				</exclusion>
 			</exclusions> 
 		</dependency>
-
+		
 		<!-- Local Dependencies -->
-
+		
 		<!-- It doesn't have a Maven Repo, http://dev.bukkit.org/bukkit-plugins/chestshop/ -->
 		<dependency>
 			<groupId>com.Acrobot</groupId>
@@ -327,12 +378,12 @@
 					<artifactId>bukkit</artifactId>
 				</exclusion>
 				<exclusion>
-					<groupId>net.milkbowl.vault</groupId>
-					<artifactId>Vault</artifactId>
+					<groupId>org.bukkit</groupId>
+					<artifactId>craftbukkit</artifactId>
 				</exclusion>
 			</exclusions> 
 		</dependency>
-
+		
 		<!-- Citizens 1.X (No API) -->
 		<dependency>
 			<groupId>net.citizensnpcs</groupId>
@@ -341,7 +392,7 @@
 			<scope>system</scope>
 			<systemPath>${project.basedir}/libs/Citizens.jar</systemPath>
 		</dependency>
-
+		
 		<!-- Old version of xAuth by Cypherx -->
 		<dependency>
 			<groupId>com.cypherx</groupId>
@@ -350,7 +401,7 @@
 			<scope>system</scope>
 			<systemPath>${project.basedir}/libs/xAuth.jar</systemPath>
 		</dependency>
-
+		
 		<!-- A SpoutApi Plugin, http://dev.bukkit.org/bukkit-plugins/notifications/ -->
 		<dependency>
 			<groupId>me.muizers</groupId>
@@ -359,6 +410,6 @@
 			<scope>system</scope>
 			<systemPath>${project.basedir}/libs/Notifications.jar</systemPath>
 		</dependency>
-
+		
 	</dependencies>
 </project>
diff --git a/snapshots/AuthMe-5.0-SNAPSHOT.jar b/snapshots/AuthMe-5.0-SNAPSHOT.jar
deleted file mode 100644
index 2aee53fc..00000000
Binary files a/snapshots/AuthMe-5.0-SNAPSHOT.jar and /dev/null differ
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 967cf87f..623077ff 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -3,7 +3,7 @@ author: Xephi59
 website: http://dev.bukkit.org/bukkit-plugins/authme-reloaded/
 description: AuthMe prevents people, which aren't logged in, from doing stuff like placing blocks, moving, typing commands or seeing the inventory of the current player.
 main: fr.xephi.authme.AuthMe
-version: ${version}
+version: 5.0-SNAPSHOT
 softdepend: [Vault, ChestShop, Spout, Multiverse-Core, Notifications, Citizens, CombatTag, Essentials, EssentialsSpawn]
 commands:
     register:
@@ -164,4 +164,4 @@ permissions:
         default: op
     authme.admin.resetposition:
         description: Reset last position for a player
-        default: op
\ No newline at end of file
+        default: op