osfstorage structure
Merge branch 'develop' of github.com:CenterForOpenScience/waterbutler into develop

Conflicts:
	waterbutler/providers/contrib/osfstorage.py