works, but with minimal error checking
Merge branch 'master' of git://github.com/davidmahoney/minecraft_update
sundry minor changes