Special cases
Merge branch 'master' of https://github.com/CenterForOpenScience/waterbutler-s3

Conflicts:
	waterbutler/s3/provider.py
Merge branch 'master' of https://github.com/CenterForOpenScience/waterbutler-s3