can log in via twitter'
Merge branch 'master' into tw_omniauth