Merge pull request #1 from callapatel/callap

Callap
fix omniauth file
omniauth changes
assoc
Merge branch 'master' into callap