Code cleanup (5).
Merge branch 'master' of https://github.com/boskee/Minecraft