Fixes S3s metadata
Merge branch 'develop' of https://github.com/icereval/waterbutler into develop

Conflicts:
	waterbutler/providers/contrib/s3.py
More Lxml crap
Special future not normal future