using ttm openid-connect strategy
Merge branch 'pks/better_faster_stronger_omniauth'
Merge branch 'master' of github.com:ninjapanzer/OpenIdConnect-testbed

Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb