Tweaked an error message to be more generally useful.
Fixed #480
Merge branch 'master' of https://github.com/codecombat/codecombat