Updates callback phase to handle error case
Merge remote-tracking branch 'origin/error_handling'

Conflicts:
	lib/omniauth/strategies/cloudfoundry.rb