Added PSX and Neogeo, removed emulationstation