Merge pull request #1 from jasnell/master

Merge to site
Merge pull request #6 from jasnell/gh-pages

Merge pull request #1 from jasnell/master