Merge pull request #16 from coogie/gh-pages

We never kept master up to date, lol