Fix user from_omniauth
Add user to from_omniauth
Change session :user_id to uid
Remove user_id from session, probably breaks stuff