Merge remote-tracking branch 'upstream/master'

.travis.yml

@@ -1,10 +1,22 @@
-language: node_js
-node_js:
-  - '4.1.2'
-
-sudo: false
-
 cache:
   directories:
   - resources
   - node_modules
+
+before_install:
+  - brew unlink node
+  - brew update
+  - brew install homebrew/versions/node4-lts
+
+script:
+  - npm install
+  - npm test
+  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && npm run integration || false'
+
+after_script:
+  - echo $MAC_KEY_CONTENT > mac_key_content.hex && xxd -p -r mac_key_content.hex ~/Library/Keychains/keychain.keychain && rm mac_key_content.hex
+  - security unlock-keychain -p "$KEY_SECRET" ~/Library/Keychains/keychain.keychain
+  - grunt release
+
+os:
+  - osx