Merge pull request #253 from totallyeviljake/master

Further removed the windows idiom and also from the tests. It works on windows xna.
Ouya build fix.