Merging master into gh-pages so that we can view on the web