omniauth basics working
Merge pull request #32 from Ryabrandt/omniauth

omniauth basics working
resolves conflicts