Merge pull request #39 from calebbradley/gh-pages

catch up merges again...
Merge pull request #40 from calebbradley/master

Merge pull request #39 from calebbradley/gh-pages