Confirmation page bug fixed.
The bug is on devise as found in the issue:
https://github.com/plataformatec/devise/issues/2976

refs #1321
Organizing feature helpers a bit
Add temporary psych version as a gem

refs #1333
Pull a few changes to Shibboleth from mconf-rnp/mconf-web
Merge branch 'branch-v2-1321-bug-confirmation-page' of git://github.com/gmiotto/mconf-web into gmiotto-branch-v2-1321-bug-confirmation-page
Merge PR #36 of gmiotto/branch-v2-1321-bug-confirmation-page into branch-v2
Merge remote-tracking branch 'upstream/branch-v2' into branch-v2

Conflicts:
	Gemfile