diff --git a/.travis.yml b/.travis.yml
index 3f53414e7..9a6bf09bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,17 @@
 osx_image: xcode7
 language: objective-c
 matrix:
+  fast_finish: true
   include:
-    - osx_image: xcode7
-      env: SCHEME="ObjectiveGit Mac"
-    - osx_image: xcode7
-      env: SCHEME="ObjectiveGit iOS"
+    - osx_image: xcode7.3
+      env:
+        - SCHEME="ObjectiveGit Mac"
+    - osx_image: xcode7.3
+      env:
+        - SCHEME="ObjectiveGit iOS"
 before_install:
-  - brew update
-  - brew outdated xctool || brew upgrade xctool
+  - gem install xcpretty
+  - gem install xcpretty-travis-formatter
 install: script/bootstrap
 script: script/cibuild
 notifications:
diff --git a/Cartfile.private b/Cartfile.private
index 6e6efae93..d7373ca9f 100644
--- a/Cartfile.private
+++ b/Cartfile.private
@@ -1,4 +1,4 @@
 github "jspahrsummers/xcconfigs" >= 0.7.1
-github "Quick/Quick" ~> 0.9.1
-github "Quick/Nimble" ~> 3.1
+github "Quick/Quick" ~> 0.9.2
+github "Quick/Nimble" ~> 4.0
 github "ZipArchive/ZipArchive" ~> 1.1
diff --git a/Cartfile.resolved b/Cartfile.resolved
index b3fea9146..b67d877a6 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,4 +1,4 @@
-github "Quick/Nimble" "v3.1.0"
-github "Quick/Quick" "v0.9.1"
+github "Quick/Nimble" "v4.0.0"
+github "Quick/Quick" "v0.9.2"
 github "ZipArchive/ZipArchive" "v1.1"
 github "jspahrsummers/xcconfigs" "0.9"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
index 72878d662..29f7fb373 160000
--- a/Carthage/Checkouts/Nimble
+++ b/Carthage/Checkouts/Nimble
@@ -1 +1 @@
-Subproject commit 72878d6622cf8362d3507cd2e3d341b06580f451
+Subproject commit 29f7fb3732893f76fa851cb37b0c4b339c49cead
diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick
index 2f037560b..dc2b4b75d 160000
--- a/Carthage/Checkouts/Quick
+++ b/Carthage/Checkouts/Quick
@@ -1 +1 @@
-Subproject commit 2f037560be197f0f5ae992512549bc29fabb3818
+Subproject commit dc2b4b75d2f718518acbdef289a72fad77975a8a
diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj
index 5834b6b40..731423e35 100644
--- a/ObjectiveGitFramework.xcodeproj/project.pbxproj
+++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj
@@ -2235,7 +2235,6 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					.,
@@ -2281,7 +2280,6 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					.,
@@ -2328,7 +2326,6 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					.,
@@ -2375,7 +2372,6 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					.,
diff --git a/ObjectiveGitTests/GTOIDSpec.m b/ObjectiveGitTests/GTOIDSpec.m
index 3f301caa9..a2aa43ab5 100644
--- a/ObjectiveGitTests/GTOIDSpec.m
+++ b/ObjectiveGitTests/GTOIDSpec.m
@@ -48,7 +48,7 @@
 	const git_oid *git_oid = NULL;
 
 	{
-		GTOID *testOID __attribute__((objc_precise_lifetime)) = [[GTOID alloc] initWithSHA:testSHA];
+		GTOID *testOID = [[GTOID alloc] initWithSHA:testSHA];
 		git_oid = testOID.git_oid;
 	}
 
diff --git a/ObjectiveGitTests/GTSignatureSpec.m b/ObjectiveGitTests/GTSignatureSpec.m
index 266f07295..86dce667c 100644
--- a/ObjectiveGitTests/GTSignatureSpec.m
+++ b/ObjectiveGitTests/GTSignatureSpec.m
@@ -49,7 +49,7 @@
 	const git_signature *git_signature = NULL;
 
 	{
-		GTSignature *testSignature __attribute__((objc_precise_lifetime)) = [[GTSignature alloc] initWithName:name email:email time:time];
+		GTSignature *testSignature = [[GTSignature alloc] initWithName:name email:email time:time];
 		git_signature = testSignature.git_signature;
 	}
 
diff --git a/README.md b/README.md
index 95afc81f5..db22e4241 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ A brief summary of the available functionality:
 
 Not all libgit2 features are available, but if you run across something missing, please consider [contributing a pull request](#contributing)!
 
-Many classes in the ObjectiveGit API wrap a C struct from libgit2 and expose the underlying data and operations using Cocoa idioms. The underlying libgit2 types are prefixed with `git_` and are often accessible via a property so that your application can take advantage of the libgit2 API directly.
+Many classes in the ObjectiveGit API wrap a C struct from libgit2 and expose the underlying data and operations using Cocoa idioms. The underlying libgit2 types are prefixed with `git_` and are often accessible via a property so that your application can take advantage of the [libgit2 API](https://libgit2.github.com/libgit2/#HEAD) directly.
 
 The ObjectiveGit API makes extensive use of the Cocoa NSError pattern. The public API is also decorated with nullability attributes so that you will get compile-time feedback of whether nil is allowed or not. This also makes the framework much nicer to use in Swift.
 
@@ -32,15 +32,18 @@ or download them [manually](#manually).
 
 ### Other Tools
 
-To start building the framework, you must install the required dependencies,
-[xctool](https://github.com/facebook/xctool) and
-[cmake](https://github.com/Kitware/CMake). We recommend using
-[Homebrew](http://brew.sh) to install these tools.
-
-Once you have the dependencies you should clone this repository and then run [`script/bootstrap`](script/bootstrap). This will automatically pull down and install any other
-dependencies.
-
-Note that the `bootstrap` script automatically installs some libraries that ObjectiveGit relies upon, using Homebrew. If you not want to use Homebrew, you will need to ensure these dependent libraries and their headers are installed where the build scripts [expect them to be](https://github.com/libgit2/objective-git/blob/master/script/bootstrap#L80-L99).
+Simply run the [`script/bootstrap`](script/bootstrap) script to automatically install
+dependencies needed to start building the framework. This script uses
+[Homebrew](http://brew.sh) to install these tools. If your Mac does not have
+Homebrew, you will need to install the following manually:
+
+- [cmake](https://github.com/Kitware/CMake)
+- libtool
+- autoconf
+- automake
+- pkg-config
+- libssh2
+  - symlinks:  lib/libssh2.a include/libssh2.h include/libssh2_sftp.h include/libssh2_publickey.h
 
 To develop ObjectiveGit on its own, open the `ObjectiveGitFramework.xcworkspace` file.
 
diff --git a/script/LICENSE.md b/script/LICENSE.md
deleted file mode 100644
index 8d9238408..000000000
--- a/script/LICENSE.md
+++ /dev/null
@@ -1,18 +0,0 @@
-**Copyright (c) 2013 Justin Spahr-Summers**
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/script/README.md b/script/README.md
deleted file mode 100644
index f66206fb3..000000000
--- a/script/README.md
+++ /dev/null
@@ -1,82 +0,0 @@
-# objc-build-scripts
-
-This project is a collection of scripts created with two goals:
-
- 1. To standardize how Objective-C projects are bootstrapped after cloning
- 1. To easily build Objective-C projects on continuous integration servers
-
-## Scripts
-
-Right now, there are two important scripts: [`bootstrap`](#bootstrap) and
-[`cibuild`](#cibuild). Both are Bash scripts, to maximize compatibility and
-eliminate pesky system configuration issues (like setting up a working Ruby
-environment).
-
-The structure of the scripts on disk is meant to follow that of a typical Ruby
-project:
-
-```
-script/
-    bootstrap
-    cibuild
-```
-
-### bootstrap
-
-This script is responsible for bootstrapping (initializing) your project after
-it's been checked out. Here, you should install or clone any dependencies that
-are required for a working build and development environment.
-
-By default, the script will verify that [xctool][] is installed, then initialize
-and update submodules recursively. If any submodules contain `script/bootstrap`,
-that will be run as well.
-
-To check that other tools are installed, you can set the `REQUIRED_TOOLS`
-environment variable before running `script/bootstrap`, or edit it within the
-script directly. Note that no installation is performed automatically, though
-this can always be added within your specific project.
-
-### cibuild
-
-This script is responsible for building the project, as you would want it built
-for continuous integration. This is preferable to putting the logic on the CI
-server itself, since it ensures that any changes are versioned along with the
-source.
-
-By default, the script will run [`bootstrap`](#bootstrap), look for any Xcode
-workspace or project in the working directory, then build all targets/schemes
-(as found by `xcodebuild -list`) using [xctool][].
-
-You can also specify the schemes to build by passing them into the script:
-
-```sh
-script/cibuild ReactiveCocoa-Mac ReactiveCocoa-iOS
-```
-
-As with the `bootstrap` script, there are several environment variables that can
-be used to customize behavior. They can be set on the command line before
-invoking the script, or the defaults changed within the script directly.
-
-## Getting Started
-
-To add the scripts to your project, read the contents of this repository into
-a `script` folder:
-
-```
-$ git remote add objc-build-scripts https://github.com/jspahrsummers/objc-build-scripts.git
-$ git fetch objc-build-scripts
-$ git read-tree --prefix=script/ -u objc-build-scripts/master
-```
-
-Then commit the changes, to incorporate the scripts into your own repository's
-history. You can also freely tweak the scripts for your specific project's
-needs.
-
-To merge in upstream changes later:
-
-```
-$ git fetch -p objc-build-scripts
-$ git merge --ff --squash -Xsubtree=script objc-build-scripts/master
-```
-
-[xctool]: https://github.com/facebook/xctool
diff --git a/script/cibuild b/script/cibuild
index 19a764840..4f2a1a356 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -1,170 +1,77 @@
-#!/bin/bash
+#!/bin/bash -ex
+#
+# script/cibuild
+# ObjectiveGit
+#
+# Executes the build and runs tests for Mac and iOS. Designed to be invoked by
+# Travis as a matrix build so that the two platform builds can run in parallel.
+#
+# Dependent tools & scripts:
+# - script/bootstrap
+# - script/update_libssl_ios
+# - [xcodebuild](https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/xcodebuild.1.html)
+# - xcpretty (gem)
+# - xcpretty-travis-formatter (gem)
+#
+# Environment Variables:
+# - SCHEME: specifies which Xcode scheme to build. Set to one of the following:
+#   - ObjectiveGit Mac
+#   - ObjectiveGit iOS
+# - TRAVIS: indicates when the build is being run by travis, used to invoke
+#           the xcpretty-travis-formatter gem for output.
+
+if [ -z "$SCHEME" ]; then
+  echo "The SCHEME environment variable is empty. Please set this to one of:"
+  echo "- ObjectiveGit Mac"
+  echo "- ObjectiveGit iOS"
+  exit 1
+fi
 
-export SCRIPT_DIR=$(dirname "$0")
 
 ##
 ## Configuration Variables
 ##
 
-SCHEMES="$@"
+set -o pipefail
+SCRIPT_DIR=$(dirname "$0")
+XCWORKSPACE="ObjectiveGitFramework.xcworkspace"
+XCODE_OPTIONS=$(RUN_CLANG_STATIC_ANALYZER=NO ONLY_ACTIVE_ARCH=NO CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO)
 
-config ()
-{
-    # The workspace to build.
-    #
-    # If not set and no workspace is found, the -workspace flag will not be passed
-    # to `xctool`.
-    #
-    # Only one of `XCWORKSPACE` and `XCODEPROJ` needs to be set. The former will
-    # take precedence.
-    : ${XCWORKSPACE=$(find_pattern "*.xcworkspace")}
-
-    # The project to build.
-    #
-    # If not set and no project is found, the -project flag will not be passed
-    # to `xctool`.
-    #
-    # Only one of `XCWORKSPACE` and `XCODEPROJ` needs to be set. The former will
-    # take precedence.
-    : ${XCODEPROJ=$(find_pattern "*.xcodeproj")}
-
-    # A bootstrap script to run before building.
-    #
-    # If this file does not exist, it is not considered an error.
-    : ${BOOTSTRAP="$SCRIPT_DIR/bootstrap"}
-
-    # Extra options to pass to xctool.
-    : ${XCTOOL_OPTIONS="RUN_CLANG_STATIC_ANALYZER=NO"}
-
-    # A whitespace-separated list of default schemes to build.
-    #
-    # Individual names can be quoted to avoid word splitting.
-    : ${SCHEMES:=$(xcodebuild -list -project "$XCODEPROJ" 2>/dev/null | awk -f "$SCRIPT_DIR/schemes.awk")}
-
-    export XCWORKSPACE
-    export XCODEPROJ
-    export BOOTSTRAP
-    export XCTOOL_OPTIONS
-    export SCHEMES
-}
+if [ -n "$TRAVIS" ]; then
+    # Use a special formatter when running on TravisCI
+    XCPRETTY_FORMAT_OPTIONS="-f `xcpretty-travis-formatter`"
+else
+    XCPRETTY_FORMAT_OPTIONS="--color"
+fi
 
 ##
 ## Build Process
 ##
 
-main ()
-{
-    config
-
-    if [ -f "$BOOTSTRAP" ]
-    then
-        echo "*** Bootstrapping..."
-        "$BOOTSTRAP" || exit $?
-    fi
-
-    if [ "$SCHEME" == "ObjectiveGit iOS" ]
-    then
-      echo "*** Prebuilding OpenSSL"
-      $SCRIPT_DIR/update_libssl_ios
-    fi
-
-    if [ -z "${SCHEME+x}" ] && [ "${#SCHEME[@]}" = 0 ]
-    then
-        echo "*** The following schemes will be built:"
-        echo "$SCHEMES" | xargs -n 1 echo "  "
-        echo
-
-        echo "$SCHEMES" | xargs -n 1 | (
-        local status=0
-
-        while read scheme
-        do
-            build_scheme "$scheme" || status=1
-        done
-
-        exit $status
-        )
-    else
-        echo "*** The following scheme will be built $SCHEME"
-        local status=0
-        build_scheme "$SCHEME" || status=1
-        exit $status
-    fi
-}
-
-find_pattern ()
-{
-    ls -d $1 2>/dev/null | head -n 1
-}
-
-run_xctool ()
-{
-    if [ -n "$XCWORKSPACE" ]
-    then
-        xctool -workspace "$XCWORKSPACE" $XCTOOL_OPTIONS "$@" \
-            ONLY_ACTIVE_ARCH=NO \
-            CODE_SIGN_IDENTITY="" \
-            CODE_SIGNING_REQUIRED=NO 2>&1
-    elif [ -n "$XCODEPROJ" ]
-    then
-        xctool -project "$XCODEPROJ" $XCTOOL_OPTIONS "$@" \
-            ONLY_ACTIVE_ARCH=NO \
-            CODE_SIGN_IDENTITY="" \
-            CODE_SIGNING_REQUIRED=NO 2>&1
-    else
-        echo "*** No workspace or project file found."
-        exit 1
-    fi
-}
-
-parse_build ()
-{
-    awk -f "$SCRIPT_DIR/xctool.awk" 2>&1 >/dev/null
-}
-
-build_scheme ()
-{
-    local scheme=$1
-
-    echo "*** Building and testing $scheme..."
-    echo
-
-    local sdkflags=()
-    local action=test
-
-    # Determine whether we can run unit tests for this target.
-    run_xctool -scheme "$scheme" run-tests | parse_build
-
-    local awkstatus=$?
-
-    if [ "$awkstatus" -eq "1" ]
-    then
-        # SDK not found, try for iphonesimulator.
-        sdkflags=(-sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 5")
-
-        # Determine whether the unit tests will run with iphonesimulator
-        run_xctool "${sdkflags[@]}" -scheme "$scheme" run-tests | parse_build
-
-        awkstatus=$?
-
-        if [ "$awkstatus" -ne "0" ]
-        then
-            # Unit tests will not run on iphonesimulator.
-            sdkflags=()
-        fi
-    fi
-
-    if [ "$awkstatus" -ne "0" ]
-    then
-        # Unit tests aren't supported.
-        action=build
-    fi
-
-    run_xctool "${sdkflags[@]}" -scheme "$scheme" $action
-}
-
-export -f build_scheme
-export -f run_xctool
-export -f parse_build
-
-main
+echo "*** Bootstrapping..."
+"$SCRIPT_DIR/bootstrap"
+
+if [ "$SCHEME" == "ObjectiveGit Mac" ]; then
+  echo "*** Building and testing $SCHEME..."
+  echo
+
+  xcodebuild -workspace "$XCWORKSPACE" \
+    -scheme "$SCHEME" \
+    ${XCODE_OPTIONS[*]} \
+    build test \
+    2>&1 | xcpretty $XCPRETTY_FORMAT_OPTIONS
+elif [ "$SCHEME" == "ObjectiveGit iOS" ]; then
+  echo "*** Prebuilding OpenSSL"
+  "$SCRIPT_DIR/update_libssl_ios"
+
+  echo "*** Building and testing $SCHEME..."
+  echo
+
+  xcodebuild -workspace "$XCWORKSPACE" \
+    -scheme "$SCHEME" \
+    -destination "platform=iOS Simulator,name=iPhone 5" \
+    -sdk iphonesimulator \
+    ${XCODE_OPTIONS[*]} \
+    build test \
+    2>&1 | xcpretty $XCPRETTY_FORMAT_OPTIONS
+fi
diff --git a/script/schemes.awk b/script/schemes.awk
deleted file mode 100644
index 4c94df914..000000000
--- a/script/schemes.awk
+++ /dev/null
@@ -1,10 +0,0 @@
-BEGIN {
-    FS = "\n";
-}
-
-/Schemes:/ {
-    while (getline && $0 != "") {
-        sub(/^ +/, "");
-        print "'" $0 "'";
-    }
-}
diff --git a/script/targets.awk b/script/targets.awk
deleted file mode 100644
index 117660dcd..000000000
--- a/script/targets.awk
+++ /dev/null
@@ -1,12 +0,0 @@
-BEGIN {
-    FS = "\n";
-}
-
-/Targets:/ {
-    while (getline && $0 != "") {
-        if ($0 ~ /Tests/) continue;
-
-        sub(/^ +/, "");
-        print "'" $0 "'";
-    }
-}
diff --git a/script/xcodebuild.awk b/script/xcodebuild.awk
deleted file mode 100644
index c746b09aa..000000000
--- a/script/xcodebuild.awk
+++ /dev/null
@@ -1,35 +0,0 @@
-# Exit statuses:
-#
-# 0 - No errors found.
-# 1 - Build or test failure. Errors will be logged automatically.
-# 2 - Untestable target. Retry with the "build" action.
-
-BEGIN {
-    status = 0;
-}
-
-{
-    print;
-    fflush(stdout);
-}
-
-/is not valid for Testing/ {
-    exit 2;
-}
-
-/[0-9]+: (error|warning):/ {
-    errors = errors $0 "\n";
-}
-
-/(TEST|BUILD) FAILED/ {
-    status = 1;
-}
-
-END {
-    if (length(errors) > 0) {
-        print "\n*** All errors:\n" errors;
-    }
-
-    fflush(stdout);
-    exit status;
-}
diff --git a/script/xctool.awk b/script/xctool.awk
deleted file mode 100644
index f6132589d..000000000
--- a/script/xctool.awk
+++ /dev/null
@@ -1,25 +0,0 @@
-# Exit statuses:
-#
-# 0 - No errors found.
-# 1 - Wrong SDK. Retry with SDK `iphonesimulator`.
-# 2 - Missing target.
-
-BEGIN {
-    status = 0;
-}
-
-{
-    print;
-}
-
-/Testing with the '(.+)' SDK is not yet supported/ {
-    status = 1;
-}
-
-/does not contain a target named/ {
-    status = 2;
-}
-
-END {
-    exit status;
-}