made pythonpath tweaks cross-OS compatible
Merge remote-tracking branch 'origin/master'

Conflicts:
	roguestate.py
made pythonpath tweaks cross-OS compatible