Merge pull request #39 from calebbradley/gh-pages

catch up merges again...