Hey look a to do that actually got done
More docstring
Merge branch 'develop' of https://github.com/icereval/waterbutler into develop

Conflicts:
	waterbutler/providers/contrib/s3.py