diff --git a/.gitignore b/.gitignore
index 2608a64..815b024 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,8 +14,6 @@ build/*
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-*.xcworkspace
-!default.xcworkspace
 xcuserdata
 profile
 *.moved-aside
diff --git a/.travis.yml b/.travis.yml
index 9fb02a2..1f2ce5b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,3 @@
 language: objective-c
-
-script: travis/build.sh
+osx_image: xcode7.3
+script: ./travisMac
diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index daa75c2..0000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,40 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (3.2.15)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    claide (0.3.2)
-    cocoapods (0.27.1)
-      activesupport (>= 3.2.15, < 4)
-      claide (~> 0.3.2)
-      cocoapods-core (= 0.27.1)
-      cocoapods-downloader (~> 0.2.0)
-      colored (~> 1.2)
-      escape (~> 0.0.4)
-      json_pure (~> 1.8)
-      open4 (~> 1.3)
-      xcodeproj (~> 0.14.0)
-    cocoapods-core (0.27.1)
-      activesupport (>= 3.2.15, < 4)
-      json_pure (~> 1.8)
-      nap (~> 0.5)
-    cocoapods-downloader (0.2.0)
-    colored (1.2)
-    escape (0.0.4)
-    i18n (0.6.5)
-    json_pure (1.8.1)
-    multi_json (1.8.2)
-    nap (0.5.1)
-    open4 (1.3.0)
-    rake (10.1.0)
-    xcodeproj (0.14.1)
-      activesupport (~> 3.0)
-      colored (~> 1.2)
-      rake
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  cocoapods
diff --git a/ObjectiveCSlim.xcodeproj/project.pbxproj b/ObjectiveCSlim.xcodeproj/project.pbxproj
index 9efeb51..95cdd5c 100644
--- a/ObjectiveCSlim.xcodeproj/project.pbxproj
+++ b/ObjectiveCSlim.xcodeproj/project.pbxproj
@@ -909,7 +909,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "rm -rf /tmp/ObjectiveCSlim\nmkdir /tmp/ObjectiveCSlim\ncp -r $CONFIGURATION_BUILD_DIR/$FULL_PRODUCT_NAME /tmp/ObjectiveCSlim/$FULL_PRODUCT_NAME\n./bin/Mac/RunSlimTests";
+			shellScript = "mkdir -p ./build/ObjectiveCSlim\ncp -r $CONFIGURATION_BUILD_DIR/$FULL_PRODUCT_NAME ./build/ObjectiveCSlim/$FULL_PRODUCT_NAME\n./bin/Mac/RunSlimTests";
 		};
 		07CB31521827E20A008F4658 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
diff --git a/ObjectiveCSlim.xcworkspace/contents.xcworkspacedata b/ObjectiveCSlim.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000..953fd45
--- /dev/null
+++ b/ObjectiveCSlim.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:ObjectiveCSlim.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/ObjectiveCSlim.xcworkspace/xcshareddata/ObjectiveCSlim.xcscmblueprint b/ObjectiveCSlim.xcworkspace/xcshareddata/ObjectiveCSlim.xcscmblueprint
new file mode 100644
index 0000000..ee27ff1
--- /dev/null
+++ b/ObjectiveCSlim.xcworkspace/xcshareddata/ObjectiveCSlim.xcscmblueprint
@@ -0,0 +1,30 @@
+{
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "89D1DB61C99DA86E7B369DDD262B7BA0762A0F8E",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+  },
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "89D1DB61C99DA86E7B369DDD262B7BA0762A0F8E" : 0,
+    "2184FCAD113E505BCD603D89586240249E5E2A1B" : 0
+  },
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "81B1387C-A182-4F4D-B759-C2A650684CA9",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "89D1DB61C99DA86E7B369DDD262B7BA0762A0F8E" : "ObjectiveCSlim\/",
+    "2184FCAD113E505BCD603D89586240249E5E2A1B" : "ObjectiveCSlim\/cslim\/"
+  },
+  "DVTSourceControlWorkspaceBlueprintNameKey" : "ObjectiveCSlim",
+  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
+  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "ObjectiveCSlim.xcworkspace",
+  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/dougbradbury\/cslim.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "2184FCAD113E505BCD603D89586240249E5E2A1B"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:ericmeyer\/ObjectiveCSlim.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "89D1DB61C99DA86E7B369DDD262B7BA0762A0F8E"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/README.markdown b/README.markdown
index 9ced2b4..8f0af65 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,5 +1,7 @@
 # Using Objective C Slim
 
+[![Build Status](https://travis-ci.org/ericmeyer/ObjectiveCSlim.svg?branch=master)](https://travis-ci.org/ericmeyer/ObjectiveCSlim)
+
 ## See here for installation/setup instructions: https://github.com/ericmeyer/OCSlim-Templates
 
 # What is Objective C Slim?
diff --git a/bin/Mac/RunSlimTests b/bin/Mac/RunSlimTests
index 9f60305..30b79c4 100755
--- a/bin/Mac/RunSlimTests
+++ b/bin/Mac/RunSlimTests
@@ -1,5 +1,7 @@
 if [[ $SLIM_PORT ]]; then
-  "/tmp/ObjectiveCSlim/AcceptanceTests.app/Contents/MacOS/AcceptanceTests" $SLIM_PORT
+  echo "Running tests on port $SLIM_PORT"
+  "./build/ObjectiveCSlim/AcceptanceTests.app/Contents/MacOS/AcceptanceTests" $SLIM_PORT
 else
+  echo "Running tests headless"
   "./bin/Mac/RunSlimTestsHeadless"
 fi
\ No newline at end of file
diff --git a/bin/Mac/RunSlimTestsTargetWithSlimPort b/bin/Mac/RunSlimTestsTargetWithSlimPort
index b0f34aa..f9413a6 100755
--- a/bin/Mac/RunSlimTestsTargetWithSlimPort
+++ b/bin/Mac/RunSlimTestsTargetWithSlimPort
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-SLIM_PORT=$1 xcodebuild -workspace "ObjectiveCSlim.xcworkspace/" -scheme "MacAcceptanceTests" -sdk macosx -configuration Debug clean build
+SLIM_PORT=$1 xcodebuild -workspace "ObjectiveCSlim.xcworkspace" -scheme "MacAcceptanceTests" -sdk macosx -configuration Debug clean build
diff --git a/travis/build.sh b/travis/build.sh
deleted file mode 100755
index afa2d87..0000000
--- a/travis/build.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -e
-
-xcodebuild ONLY_ACTIVE_ARCH=NO -scheme iOSSpecs -sdk iphonesimulator6.1 -configuration Debug clean build -workspace ObjectiveCSlim.xcworkspace
diff --git a/travisMac b/travisMac
new file mode 100755
index 0000000..f931272
--- /dev/null
+++ b/travisMac
@@ -0,0 +1,3 @@
+xcodebuild -workspace "ObjectiveCSlim.xcworkspace" -scheme "MacAcceptanceTests" -sdk macosx -configuration Debug clean build
+ls -lR ./build
+java -jar fitnesse-standalone.jar -c "MacRunnerTests?suite&format=text"