Updating gh-pages to make use of mortartjs v0.5
Merge branch 'gh-pages-v0.5' into gh-pages