fix jshint errors
Merge branch 'trickle-demo' into gh-pages