std. test dir
Merge branch 'master' of https://github.com/CenterForOpenScience/waterbutler-s3

Conflicts:
	tests/s3/test_provider.py
std testing dir