Clean up Travis and Jenkins (#353)

* Make travis do what Jenkins will do. Make Jenkins not do what Travis does.

* Enable docker in travis

.travis.yml

@@ -8,6 +8,7 @@ git:
 
 services:
   - redis
+  - docker
 
 before_install:
   - source scripts/travis-deps.sh
@@ -21,3 +22,4 @@ script:
   - make test
   - goveralls -coverprofile=.coverprofile -service=travis-ci
   - make test-captplanet
+  - make binaries

Jenkinsfile

@@ -9,7 +9,7 @@ node('node') {
     }
 
     stage('Build Images') {
-      sh 'make test-docker images'
+      sh 'make images'
 
       echo "Current build result: ${currentBuild.result}"
     }
@@ -58,7 +58,7 @@ node('node') {
   finally {
 
     stage('Cleanup') {
-      sh 'make test-docker-clean clean-images'
+      sh 'make clean-images'
       deleteDir()
     }