Merge branch 'master' into ben/ios-test-target

Author: Ben Chatelain

.gitignore

@@ -28,5 +28,7 @@ ObjectiveGitTests/fixtures/Fixtures/*
 
 External/ios-openssl/include
 External/ios-openssl/lib
-
 External/libssh2-ios
+
+Carthage/Build
+

.travis.yml

@@ -1,13 +1,6 @@
+osx_image: xcode6.4
 language: objective-c
-install:
-- brew install cmake
+install: script/bootstrap
 script: script/cibuild
 notifications:
   email: false
-  campfire:
-    on_success: always
-    on_failure: always
-    template:
-      - "Build %{build_url} of %{repository}: %{message}"
-    rooms:
-      secure: IxO/lskcwkcrvbgq9UsI4rjD7auSbbc52QdOcEzh5klXf6KkmIRSrJDUbsRGJ6GahlB0ELfgTcr0ycqsYhW5M9mNwzWR1cerbedA2HT0sOy7uvgGQwAY+iiikCsIMuYQJ1qvb6DrrpgyejQWXW5cOEVbNuoPV45DE0lsPUHcpyg=

script/bootstrap

@@ -57,7 +57,7 @@ check_deps ()
 
     # Ensure that we have libgit2's dependencies installed.
     installed=`brew list`
-    libs="libssh2 libtool autoconf automake"
+    libs="libssh2 libtool autoconf automake pkg-config"
 
     for lib in $libs
     do