Merge branch 'develop'
skipping mongo tests due to bugs in travis.ci
Merge branch 'master' of http://github.com/bshaffer/oauth2-server-php into develop
Merge branch 'develop' of http://github.com/bshaffer/oauth2-server-php into develop