Cleanup n' stuff
Merge branch 'master' of ssh://github.com/jacobgardner/ludum-dare-support

Conflicts:
	game/mapLevel.py
	game/maps/map1.txt
Added missing files.