Detect heroku remotes again
Really detect this time
Merge branch 'master' of github.com:remind101/git-deploy into builtin-middleware

Conflicts:
	lib/git-deploy/git_config.rb