devise with twitter and backbone
git ignore conflict resolved