Merge branch 'deploy' of github.com:lielongxingkong/windchimes into deploy

Conflicts:
	swift/storage/server.py
Merge branch 'deploy' of github.com:lielongxingkong/windchimes into deploy