Pull Bukkit PRs related to formatting

Credited PRs:

- [Bukkit #1066](https://github.com/Bukkit/Bukkit/pull/1066)
- [Bukkit #1030](https://github.com/Bukkit/Bukkit/pull/1030)
- [Bukkit #1034](https://github.com/Bukkit/Bukkit/pull/1034)

Thanks @stuntguy3000 and @eueln! Sorry they didn't make it into Bukkit :(