Mapper tweaks
Fix 8KB -> 4KB on MMC1 CHR selector
Merge branch 'master' of github.com:crust/nes

Conflicts:
	include/cpu.h
	src/mappers/sxrom.cpp