Fixed a couple bugs and tests.
Merge branch 'master' of https://github.com/codecombat/codecombat