Add ability to link OpenID login to existing User
Fix bugs
Merge pull request #2 from snakescott/master

Reviewed, now review the pull request in BetterWorks.