Setting version to 2.0.0, fixing broken test
Update version
Updating docs
Merge branch 'master' of github.com:forcedotcom/phoenix
Fix docs