Merge https://github.com/boskee/Minecraft
Merge https://github.com/boskee/Minecraft
Merge branch 'master' of git://github.com/ronmurphy/Minecraft