Begin CloudFiles tests.
Merge branch 'develop' of https://github.com/centerforopenscience/waterbutler into develop

Conflicts:
	waterbutler/providers/contrib/cloudfiles.py