Merge pull request #1 from snakescott/master

Multi-SSO support
Add ability to link OpenID login to existing User