Rolled back a ton of stuff. Bugs reintroduced that were fixed in 1.1, but it compiles now.
Merge branch 'master' of https://github.com/Camtendo/jokemon