Merge branch 'refactoring' of github.com:salmonmoose/roguelike into refactoring

Conflicts:
	Interface.py
	Roguelike.py
Merge branch 'refactoring' of github.com:salmonmoose/roguelike into refactoring

Conflicts:
	Interface.py