Merge remote-tracking branch 'mmrobins/allow_http' into allow_http_2014-02-11

Conflicts:
	lib/hub/github_api.rb
	test/hub_test.rb