Merge all the changes we keep making into master to the gh-pages branch #6

Closed joshuabremer closed 9 years ago