cleaning up, fixing js
Merge branch 'master' into gh-pages

* master:
  cleaning up, fixing js