Merge pull request #1 from Jcrowley/master

Pull to gh pages
Merge pull request #2 from Jcrowley/gh-pages

Merge pull request #1 from Jcrowley/master