Incorporated Ouya Plugins
Minor Cleanup