reworked mupen64rpi for new build location / system
fixed - left over pushd after memory/swap changes
Merge remote-tracking branch 'upstream/master' into separate_sources

Conflicts:
	scriptmodules/emulators/gpsp.sh