Support for specifying an https url for staging upload
Merge remote-tracking branch 'origin/pr/205'

Conflicts:
	spec/config_spec.rb