More Ouya game pad corrections
Merge pull request #204 from Nananas/dev

More Ouya game pad corrections, plus two extra buttons