Merge pull request #9 from calebbradley/gh-pages

catch-up merges!
Merge pull request #10 from calebbradley/master

Merge pull request #9 from calebbradley/gh-pages