Merge pull request #439 from tjarratt/pull_request_travis

Don't try to use SauceLabs on pull request builds

travis-core-script.sh

@@ -1,12 +1,14 @@
 #!/bin/bash -e
 
-export DISPLAY=:99.0
-
-/etc/init.d/xvfb start
-
 if [ $USE_SAUCE == true ]
 then
+  if [ $TRAVIS_SECURE_ENV_VARS == true ]
+  then
     curl https://gist.github.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash
+  else
+    echo "skipping tests since we can't use sauce"
+    exit 0
+  fi
 fi
 
 bundle exec rake jasmine:ci