-Updated es_input.cfg so that the emulation station controls now use Circle instead of Square for "back"
-Updated joystick mapper install script
Merge branch 'master' of https://github.com/free5ty1e/primestationone