Merge branch 'gh-pages'
make jslint happy
Merge branch 'master' into gh-pages