Merge pull request #323 from ThePlayground/master

Let's let Moga start actually handling Moga events, Fix Rjoy
Merge pull request #326 from ThePlayground/master

Revert "Let's let Moga start actually handling Moga events, Fix Rjoy"
ouya again
toned the ouya fix down slightly
makes r3 be start button, allows menu button to work