Merge pull request ReactiveCocoa#1648 from jconst/swift-development

More ways to merge HotSignals; Update to carthage 0.4

Author: jspahrsummers

.gitignore

@@ -14,4 +14,4 @@ xcuserdata
 profile
 *.moved-aside
 
-Carthage.build
+Carthage/Build

.gitmodules

@@ -1,12 +1,12 @@
 [submodule "Carthage.checkout/Nimble"]
-	path = Carthage.checkout/Nimble
+	path = Carthage/Checkouts/Nimble
 	url = https://github.com/Quick/Nimble.git
 [submodule "Carthage.checkout/Quick"]
-	path = Carthage.checkout/Quick
+	path = Carthage/Checkouts/Quick
 	url = https://github.com/Quick/Quick.git
 [submodule "Carthage.checkout/xcconfigs"]
-	path = Carthage.checkout/xcconfigs
+	path = Carthage/Checkouts/xcconfigs
 	url = https://github.com/jspahrsummers/xcconfigs.git
 [submodule "Carthage.checkout/LlamaKit"]
-	path = Carthage.checkout/LlamaKit
+	path = Carthage/Checkouts/LlamaKit
 	url = https://github.com/Carthage/LlamaKit.git

Cartfile.lock

@@ -0,0 +1,4 @@
+github "Carthage/LlamaKit" "carthage-0.1.1"
+github "Quick/Nimble" "v0.2.0"
+github "Quick/Quick" "v0.2.0"
+github "jspahrsummers/xcconfigs" "0.7"