working omniauth
merged with master