Neaten up code in multiple classes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/me/pvmac2194/bukkitbungee/BukkitBungee.java