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

Conflicts:
	src/me/pvmac2194/bukkitbungee/BukkitBungee.java
Fix GitHub conflicting issue.
Merge branch 'master' of https://github.com/pvmac2194/BukkitBungee;
Build against 1.7.10-R0.1-SNAPSHOT;
Revert 2272f7b 1.7.10-R0.1 uses iterables;