Fixing jshint errors
Merge branch 'leap' into gh-pages