Merge branch 'master' of https://github.com/mattt/Surge

Author: rfdickerson

.travis.yml

@@ -1,3 +1,7 @@
 language: objective-c
-xcode_project: Surge.xcodeproj
-xcode_scheme: Surge
+osx_image: xcode7.3
+
+script:
+  - xcodebuild clean build test -workspace Surge.xcworkspace -scheme Surge -destination 'platform=iOS Simulator,name=iPhone 6,OS=9.2'
+  
+

README.md

@@ -1,4 +1,5 @@
-# Surge [![Build Status](https://travis-ci.org/mattt/Surge.svg?branch=master)](https://travis-ci.org/mattt/Surge) [![GitHub license](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://github.com/mattt/Surge/blob/master/LICENSE)
+# Surge [![GitHub license](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://github.com/mattt/Surge/blob/master/LICENSE)
+
 
 *Swift + Accelerate*