Merge gh-pages to local master branch 

Trying this one more time.