Merge pull request #1467 from darkwing/js-cleanup

JSLint cleanups for JS