cleans up js after commit and merge errors in other repo
Merge pull request #1 from cptvitamin/master

Merging from cptvitamin