basic map rendering
Merge branch 'master' of github.com:euclio/roguelike

Conflicts:
	game/map.py
added some world stuff