Sync master to changes from creating github page

This will bring master up to date with changes from gh-pages, which is the branch used to host the github page. This is related to #3