[BUGFIX beta] Fix files that aren't passing JSHint
Merge pull request #4652 from bradfol/jshint-fixes

[BUGFIX beta] Fix files that aren't passing JSHint