Fixed formatting warnings
Merge branch 'master' of https://github.com/ucsc-hp-group/swift into osms-middleware

Conflicts:
	swift/common/middleware/metadata.py