* integration_take_2:
  Make Integration tests more robust

Conflicts:
	Gemfile.lock
	spec/integration/install_add_pod/after/Pods/Pods.xcodeproj/project.pbxproj
	spec/integration/install_add_pod/after/execution_output.txt

* integration_take_2:
  [Specs Integration] Ingore CocoaPods version in lockfiles

* integration_take_2:
  [Specs Integration] Preserve the results of each test.

* integration_take_2_0_17_test:
  [Specs Integration] Clean implementation a bit.
  [TargetInstaller] Sort headers in xcconfig.
  [Bundle] update
  Add .hg folders to specs repos
  [Gitignore] Don't ignore .hg folders
  [Specs Integration] Added more tests.
  [Specs Integration] Clean up implementation.
  [Specs Integration] Skip unreliable tests.
  [Installer] Don't show using existing documentation message if docs should be skipped
  [Specs] Added integration specs
  [Specs Integration] Add check for output.
  Integrations tests part 2

* integration_take_2:
  [Specs Integration] Clean implementation a bit.
  [TargetInstaller] Sort headers in xcconfig.
  [Bundle] update
  Add .hg folders to specs repos
  [Gitignore] Don't ignore .hg folders
  [Specs Integration] Added more tests.
  [Specs Integration] Clean up implementation.
  [Specs Integration] Skip unreliable tests.
  [Installer] Don't show using existing documentation message if docs should be skipped
  [Specs] Added integration specs
  [Specs Integration] Add check for output.
  Integrations tests part 2

Conflicts:
	.gitignore
	Gemfile.lock
	lib/cocoapods/installer.rb
	lib/cocoapods/installer/target_installer.rb

* 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

* master:
  [Specs] Fix for master repo changes