Merge pull request #1 from globalization/master

urgh god, merging badness on my part
Merge pull request #2 from globalization/gh-page

Merge pull request #1 from globalization/master