For E
Set up factories.rb and spec_helper.rb for twitter_api_spec
Set up VCR for twitter_api_spec
Fix merge conflicts
Resolve conflicts and merge branch vcr