Merge pull request #3 from travisneilson/master

Master
Merge pull request #4 from travisneilson/gh-pages

Merge pull request #3 from travisneilson/master