I can't take credit for all of this :-)
Merge pull request #521 from mbarringer/master

I can't take credit for OSEM :-)
Merge pull request #528 from ChrisBr/devise

Implements iChain authentication
Set the ichain base url
Update rails/sprockets to fix CVE-2014-7818/CVE-2014-7819
Include disabled omniauth in ichain config for delayed jobs
Use the correct URL for the ichain login
It's always hard to remove another layer of indirection...
Adds disabled flag to user and checks it if iChain is enabled