Merge master into gh-pages

Publish hardline javascript for serve.