General clean up
Merge pull request #1 from Frozenfire92/gh-pages

General clean up