Setup support for twitter omniauth
Resolve merge conflicts