Merge branch 'master' into rackspace_production

Conflicts:
	requirements.txt
updating release to 2.1.0~rax2
Merge branch 'rackspace_production' of github.com:rackerlabs/swift into rackspace_production