Removed twitter dependency from Gemfile as it's causing depenedencies issues sometimes, and the twitter notification feature isn't that used anyway.
Merge remote-tracking branch 'origin/master'