added omniauth-twitter
conflict resolution
Merge branch 'master' of https://github.com/tallkeith/blogarhythm