* master:
  [Specs] Fix for master repo changes
  Never consider aggregate targets for integration. Fixes #729 & 784.
  Let’s get Travis to build again.
  Updated downloader spec to check for unflattened zipfiles
  Do not flatten the zip files downloaded via http

Conflicts:
	lib/cocoapods/downloader/http.rb
	lib/cocoapods/installer/user_project_integrator.rb
	spec/functional/downloader_spec.rb
	spec/unit/installer/user_project_integrator_spec.rb
	spec/unit/resolver_spec.rb
	spec/unit/source_spec.rb