diff --git a/.travis.yml b/.travis.yml
index 146eec1e..6a202ec0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,8 +15,6 @@ git:
 addons:
   homebrew:
     packages:
-    #- rpm
-    #- gnu-tar
     - upx
   apt:
     packages:
@@ -29,7 +27,6 @@ addons:
     - zip
     - debsigs
     - gnupg
-    - expect
     - upx
 install:
   - mkdir -p $(go env GOPATH)/bin
@@ -52,10 +49,10 @@ script:
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then docker run $BINARY -v 2>&1 | grep -Eq "^$BINARY,? v.*$VERSION"; fi
   # Build everything
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then rvm 2.6.0 do make release; fi
-  # Build mac binary or image, and test homebrew (with make install).
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then make dmg \
-      make install VERSION=$VERSION ITERATION=$ITERATION PREFIX=/tmp/up-$VERSION ETC=/tmp/up-$VERSION/etc \
-    fi
+  # Build mac binary or image.
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then make dmg; fi
+  # Test homebrew (with make install).
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; make install VERSION=$VERSION ITERATION=$ITERATION PREFIX=/tmp/ab-$VERSION ETC=/tmp/ab-$VERSION/etc; fi
 after_success:
   # Display Release Folder
   - ls -l release/
@@ -126,6 +123,7 @@ deploy:
     on:
       tags: true
       condition: "$TRAVIS_OS_NAME = linux"
+  # Upload built files to github too.
   - provider: releases
     api_key:
       secure: GsvW0m+EnRELQMk8DjH63VXinqbwse4FJ4vNUslOE6CZ8PBXPrH0ZgaI7ic/uxRtm7CYj0sir4CZq62W5l6uhoXCCQfjOnmJspqnQcrFZ1xRdWktsNXaRwM6hlzaUThsJ/1PD9Psc66uKXBYTg0IlUz0yjZAZk7tCUE4libuj41z40ZKxUcbfcNvH4Njc9IpNB4QSA3ss+a9/6ZwBz4tHVamsGIrzaE0Zf99ItNBYvaOwhM2rC/NWIsFmwt8w4rIA2NIrkZgMDV+Z2Niqh4JRLAWCQNx/RjC5U52lG2yhqivUC3TromZ+q4O4alUltsyIzF2nVanLWgJmbeFo8uXT5A+gd3ovSkFLU9medXd9i4kap7kN/o5m9p5QZvrdEYHEmIU4ml5rjT2EQQVy5CtSmpiRAbhpEJIvA1wDtRq8rdz8IVfJXkHNjg2XdouNmMMWqa3OkEPw21+uxsqv4LscW/6ZjsavzL5SSdnBRU9n79EfGJE/tJLKiNumah/vLuJ5buNhgqmCdtX/Tg+DhQS1BOyYg4l4L8s9IIKZgFRwrOPsZnA/KsrWg4ZsjJ87cqKCaT/qs2EJx5odZcZWJYLBngeO8Tc6cQtLgJdieY2oEKo51Agq4rgikZDt21m6TY9/R5lPN0piwdpy3ZGKfv1ijXx74raMT03qskputzMCvc=
@@ -136,6 +134,7 @@ deploy:
     file: release/*
     on:
       tags: true
+  # Upload homebrew formula file to a special repo.
   - provider: script
     script: scripts/formula-deploy.sh
     on: