syncing up, don't remember what changes I made
Merge branch 'master' of ssh://github.com/mpownby/emucore

Conflicts:
	disassembly/game/starrider/starrider-main-cpu.idb