Some gamepad testing, improved ouya gamepad support
Merge branch 'master' of github.com:Catacomb-Snatch/Catacomb-Snatch