Merge pull request #9 from megantaylor/gh-pages

cleanup, cleanup, everybody everywhere!
moar fixes
Merge pull request #10 from megantaylor/master

moar fixes