removing unused twitter code from user model
solving conflicts
Merge branch 'master' of github.com:catarse/catarse