Added Socrates Login
Pulling in changes from master.
Merge branch 'master' into socrates_login_integration
Merge pull request #3 from alycit/socrates_login_integration

Socrates login integration