Fix the mapping to avoid dealing with OUYA default configs
Make the menu look a little bit neater on entry / exit function
Merge pull request #328 from ThePlayground/master

Fix the mapping to avoid dealing with OUYA default configs