Merge pull request #6 from travisneilson/gh-pages

Merge pull request #5 from travisneilson/master
Merge pull request #7 from travisneilson/master

Merge pull request #6 from travisneilson/gh-pages