full v 1.0 to gh-pages branch
Revert "full v 1.0 to gh-pages branch"

This reverts commit d73ce502805b2fcc1545c77ca2c1289ad9f5b4a2.
Merge pull request #1 from dfosco/master

Pull master into gh-pages