Merge pull request #9 from calebbradley/gh-pages

catch-up merges!