Commits now to change a stupid merge conflict. Also adds omniauth to devise.