Fix circular import
Fix metadata
Fixes for the path update
Merge branch 'master' of https://github.com/CenterForOpenScience/waterbutler-osfstorage