Merge branch 'develop' into celerytests
added the dataone config file
Merge branch 'develop' of https://github.com/fabianvf/scrapi into develop
trying to fix weird yaml files
Merge branch 'develop' of https://github.com/fabianvf/scrapi into develop
Merge pull request #46 from erinspace/develop

Add DataONE yml file to manifests