JS cleanup 2.0
Merge pull request #7 from brennentsmith/master

JS cleanup 2.0