attempting to fix busted ORCID authentication
Merge branch 'master' of github.com:mfenner/cr-search
Merge branch 'master' of github.com:mfenner/cr-search
Merge branch 'master' of github.com:mfenner/cr-search
trying to fix broken ORCID integration.
Merge branch 'master' of github.com:mfenner/cr-search
Merge branch 'master' of github.com:mfenner/cr-search
Merge branch 'master' of github.com:mfenner/cr-search

Conflicts:
	app.rb
	config/settings.yml
Merge branch 'master' of github.com:mfenner/cr-search
removed.
fix conflict after merging latest commits from master
Merge branch 'master' of github.com:mfenner/cr-search
Extra logging for session.rb