Merge branch 'bchretien/master'

.travis.yml

@@ -6,5 +6,7 @@ python:
   - "3.4"
   - "3.5"
 
+sudo: false
+
 script:
   - ./test/test_travis

test/test_travis

@@ -8,6 +8,12 @@ set -e
 
 BASEDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 
+# Prevent execution outside of Travis CI builds
+if [[ "${TRAVIS}" != true || "${CI}" != true ]]; then
+    echo "Error: `basename "$0"` should only be used on Travis"
+    exit 2
+fi
+
 # Travis runs do not rely on Vagrant
 export USE_VAGRANT=false
 export DOTBOT_EXEC="${BASEDIR}/bin/dotbot"