fixes windows upload (honest!)
Merge branch 'master' into feature/url-naming

Conflicts:
	binstar_client/commands/upload.py