Code cleaning.
Merge branch 'master' of https://github.com/boskee/Minecraft

Conflicts:
	controllers.py