Merge pull request #30 from jatoben/travis-xcode7

Re-enable Travis builds

Author: jatoben

.travis.yml

@@ -1,9 +1,5 @@
-language: objective-c
+language: objective-c # this is a lie
 xcode_project: CommandLine.xcodeproj
 xcode_scheme: CommandLine
 script: xcodebuild -scheme CommandLine test
-osx_image: beta-xcode6.3
-
-# Disable all builds until Travis supports Swift 2.0
-branches:
-  only: []
+osx_image: xcode7