Merge gh-pages back into master

Made a quick edit to pages to make some copy look nice live, putting it into master because why not