omniauth for twitter signin
conflict merge
Merge branch 'master' of https://github.com/charlesdg/twitter-bitch-bot