Merge branch 'master' into 0.17

* 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

.travis.yml

@@ -12,3 +12,4 @@ notifications:
     on_failure: always
     rooms:
       - secure: "qOE5zmgaHe/qQu3W9rmj7wygA5Ivl+cx50fqWGag2bdRl8ly5yj1NVoOKk/O\nZmQc4Lze+301uvTXi+r5v8A/tF6W1kUZw7yBiKuXoYFUGmDiVR9o2I/FPwkL\ngSzPJttrXTQfkQ4PbnrkX+JO+5bLWrKaO0hKXT4B2yUu4UXLVk0="
+

spec/fixtures/SampleProject/SampleProject.xcodeproj/project.pbxproj

@@ -6,6 +6,19 @@
 	objectVersion = 46;
 	objects = {
 
+/* Begin PBXAggregateTarget section */
+		51D6A8AB16C445B800E174E1 /* AggregateTarget */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 51D6A8B116C445B800E174E1 /* Build configuration list for PBXAggregateTarget "AggregateTarget" */;
+			buildPhases = (
+			);
+			dependencies = (
+			);
+			name = AggregateTarget;
+			productName = AggregateTarget;
+		};
+/* End PBXAggregateTarget section */
+
 /* Begin PBXBuildFile section */
 		51075D4C1521D0C100E39B41 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A346497114F9BE9A0080D870 /* UIKit.framework */; };
 		51075D4D1521D0C100E39B41 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A346497314F9BE9A0080D870 /* Foundation.framework */; };
@@ -224,6 +237,7 @@
 			targets = (
 				A346496C14F9BE9A0080D870 /* SampleProject */,
 				51075D491521D0C100E39B41 /* TestRunner */,
+				51D6A8AB16C445B800E174E1 /* AggregateTarget */,
 			);
 		};
 /* End PBXProject section */
@@ -421,6 +435,34 @@
 			};
 			name = "App Store";
 		};
+		51D6A8AC16C445B800E174E1 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		51D6A8AD16C445B800E174E1 /* Test */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Test;
+		};
+		51D6A8AE16C445B800E174E1 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+		51D6A8AF16C445B800E174E1 /* App Store */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = "App Store";
+		};
 		A346498314F9BE9A0080D870 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -502,6 +544,16 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		51D6A8B116C445B800E174E1 /* Build configuration list for PBXAggregateTarget "AggregateTarget" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				51D6A8AC16C445B800E174E1 /* Debug */,
+				51D6A8AD16C445B800E174E1 /* Test */,
+				51D6A8AE16C445B800E174E1 /* Release */,
+				51D6A8AF16C445B800E174E1 /* App Store */,
+			);
+			defaultConfigurationIsVisible = 0;
+		};
 		A346496714F9BE990080D870 /* Build configuration list for PBXProject "SampleProject" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (