Merge pull request #1 from storm-labs/gh-pages

Merged everything back into master