Merge?
Merge branch 'develop' of https://github.com/CenterForOpenScience/waterbutler into develop
Need an index.rst to build docs