Add devise and omniauth.
Merge conflict.