fix typo
fix jslint warnings
Merge branch 'master' of https://github.com/code-dot-org/blockly