adding fakeweb dependency to gemspec
fixing vcr api key
fixing merge conflicts