First cut at condarc and proxy settings
Merge remote-tracking branch 'upstream/master'
Added option to list of rc options, changed import to match updates in connection_handling
Removed proxy server from config options
Merge remote-tracking branch 'jacoblsmith/master'

Conflicts:
	condarc
	tests/condarc