Update to 1.6-SNAPSHOT and add in Ouya module