Merge branch 'master' into development

* master:
  change travis config

Author: nuclearace

.travis.yml

@@ -2,12 +2,9 @@ language: objective-c
 xcode_project: Socket.IO-Client-Swift.xcodeproj # path to your xcodeproj folder
 xcode_scheme: SocketIO-iOS
 osx_image: xcode7.3
-before_install:
-    - cd Socket.IO-Test-Server/
-    - npm install
-    - cd ..
+branches:
+  only:
+    - master
+    - development
 install: node Socket.IO-Test-Server/main.js &
 script: xctool -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-Mac build test -parallelize
-cache:
-  directories:
-    - Socket.IO-Test-Server/node_modules