Merge pull request #58 from calebbradley/gh-pages

Merging pull requests #53 - #57
Merge pull request #59 from calebbradley/master

Merge pull request #58 from calebbradley/gh-pages