Merge pull request #18 from calebbradley/gh-pages

catch up merges
Merge pull request #19 from calebbradley/master

Merge pull request #18 from calebbradley/gh-pages