* master: Rewrite a spec that expects a certain error to be raised. Add explicit flattening option to Downloader:Http Conflicts: lib/cocoapods/downloader/http.rb spec/unit/http_spec.rb
