site updates
Merge branch 'master' into gh-pages
Deploying to gh-pages