Overhaul the Travis config to fix builds

.travis.yml

@@ -1,17 +1,31 @@
 
-# Language/versions
+# Build matrix
 language: node_js
-node_js:
-  - "5"
-  - "4"
-  - "0.12"
-  - "0.10"
+matrix:
+  include:
+
+    # Run linter once
+    - node_js: '5'
+      env: LINT=true
+
+    # Run tests
+    - node_js: '0.10'
+    - node_js: '0.12'
+    - node_js: '4'
+    - node_js: '5'
+
+# Restrict builds on branches
+branches:
+  only:
+    - master
+    - /^\d+\.\d+\.\d+$/
 
 # Before install
 before_install:
   - npm install coveralls
 
 # Build script
 script:
-  - make ci
-  - cat ./coverage/lcov.info | ./node_modules/.bin/coveralls
+  - 'if [ $LINT ]; then make lint; fi'
+  - 'if [ ! $LINT ]; then make test; fi'
+  - 'if [ ! $LINT ]; then cat ./coverage/lcov.info | ./node_modules/.bin/coveralls; fi'

Makefile

@@ -26,7 +26,7 @@ jscs:
 	@./node_modules/.bin/jscs .
 
 # Run all tests
-test: test-unit
+test: test-coverage
 
 # Run unit tests
 test-unit: