adding Omniauth Twitter
db merge fix