Merge pull request #18 from calebbradley/gh-pages

catch up merges