Refactor!
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/net/tridentsdk/server/TridentConfig.java
	src/main/java/net/tridentsdk/server/TridentStart.java
Refactor!