Several changes and fixes.
Merge branch 'master' of https://github.com/JordanBussanich/bukkit-phone