Adds users via Devise, as well as Twitter login
Adds Facebook login
fixing conflicts