diff --git a/.travis.yml b/.travis.yml
index 17cd8be91..b139528f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,17 +11,27 @@ env:
     - secure: "fn3QWEi/PPcq4CGAVqlWauFn6/yVnb7MtBVWAkcrMDGSty1OdTkXt9LrBLcrnYKMsonxauJJSA3grx0mDqUZ+5vR7TjO3Cg7lcXuMZe/pdWia3DDJ4+Rl/Lw8viCD2rczNzI8E9R/FHBRhepx3T9n4wDQKv5ozoVyqw/4iZaJ+DMxqYRng3o6f541gsYBl6QNIe0ZcGmsy6izaD94IfNemHNS31HOqXtJeVAhwBo59jx/tk1KrMo724s7tr++bkzAJH04T4UlHKKJe/aJpxf592ZEIbahjOk3AwbB6HAr9Nh9ZiQKZW2BYE3S1Me/laZ42bF4+c6HcIlor/UY6WQsjdEoL+MULg0BdSQxuhd/Gc3VIp9pupQM8B+soshOTfLTKVj4nK/gOQxfsoHY4HZXHBAvKnxyOGC7PXwh/hiPdRDKRtWcCwUqY4joo0zd0Mn9Tno7Q4TOfDxWMsiqRyJ6VoDndrLlBqu4USkoLY3mhN2BfXHekCX1G+f4HErOiQDxTPp3GY7o3uAwp0r4Pj+qsGsDeou2cxdFgPexlWQc2NNAfqPoA42TORWV4xqLkNzyWhE6946dC5NUM4sAy3wHShwEUaW0WT/WUoFvDH0VQPSdH2sLjxkx7m+vnkHa4H31JfOUigR3DgZ8MlZFFmJIKPH37F2fb4x7m1d1uwciEg="
     - secure: "K2cy5+vb/BbWz92nCDacFwe3chy62qqegNcmwk+69JCuGKDtHiWaEsukm2arp/OiTcwXJgZjw35NhUrbIXzYtIaegc+4ImXOpMsGeOwxPruzNt+a+Yp9uAECs6fs+tI75RrGmVjVZZCx2J4cAYrjYAqLt7wvv9liB4PE+sOZZmzMLBJ1mC5JI1hN5qyRR18Q2xnTcTVfMciEpW3QtpGRSlecdQUUSXryDLTRo4OCgYNpWMDoX5q5XfMqPKkfjcjXuAvJfKjvWD64etSEUguC64/cEUiOsW6culvZimNSlF5Lv5MkrBmrEYCW677MT/R/eIllaaATmuFqoeQ3Dw1Pc2j49PL8pQisggA/tSRt/csUyoPouPEezD4uZitj+oSWX6qOl1sV+AV2Pd/ApR9YRRNXm8Z/bp0ZqobBt5ev5pM9eoDL9qoypGWR5RdLcOwhpiGt5EzhhhW7/oDOR+XD43WK6Rv776jW1RTAMwQuEf8uL62c7HNcBjhNO3sovd4RKnGp6jNz5NTB10T2F2RvapSNJLIuhZjb2MjCGhjD4p6cJdEL84hBcQkGO9aJP4G1oT7y8sCfLTWwvH4xUSIH9X2joMNQMu+Dni9QmH5j9d2iakwo4k1SocCbTkfy1CPwNKLCn81t/mMtXKKgIDJZ3b1SC/ljCAvGRHgvUmIhVdg="
 
-
 jobs:
   include:
     - stage: fast_check
+      name: Shell linter
       language: shell
       script:
         - bash -c 'shopt -s globstar; shellcheck -e SC1117 **/*.sh'
 
-    - stage: build_and_pack
+    - stage: fast_check
+      name: Fast build
       os: linux
+      language: minimal
+      services:
+        - docker
+      before_install:
+        - docker pull fritzing/build:xenial
+      script:
+        - docker/build-linux.sh
 
+    - stage: build_and_pack
+      os: linux
       language: minimal
       services:
         - docker
@@ -33,6 +43,9 @@ jobs:
         - docker/release-linux.sh $TRAVIS_COMMIT-debug-continuous-$TRAVIS_BUILD_NUMBER
         - cp fritzing-"$TRAVIS_COMMIT"-debug-continuous-$TRAVIS_BUILD_NUMBER.linux.AMD64.tar.bz2 "$HOME/$TRAVIS_BUILD_NUMBER/"
 
+      after_success:
+        - ./tools/aws_tasks.sh synchronize_up
+
     - stage: build_and_pack
       os: osx
       language: cpp
@@ -44,7 +57,8 @@ jobs:
       addons:
         homebrew:
           packages:
-            - qt5
+          - qt5
+          update: false
 
       before_install:
         - mkdir -p ../libgit2/build
@@ -55,11 +69,16 @@ jobs:
         - mkdir -p "$HOME/$TRAVIS_BUILD_NUMBER"
         - ./tools/aws_tasks.sh setup
       script:
+        - ls /usr/local/opt
         - tools/deploy_fritzing_mac.sh
         - cp ../deploy-app/Fritzing.dmg $HOME/$TRAVIS_BUILD_NUMBER/fritzing-"$TRAVIS_COMMIT"-debug-continuous-$TRAVIS_BUILD_NUMBER.10.2.dmg
 
-    - os: osx
-      language: objective-c
+      after_success:
+        - ./tools/aws_tasks.sh synchronize_up
+
+    - stage: build_and_pack
+      os: osx
+      language: cpp
       osx_image: xcode10.1
       cache:
         directories:
@@ -68,7 +87,8 @@ jobs:
       addons:
         homebrew:
           packages:
-            - qt5
+          - qt5
+          update: true
 
       before_install:
         - mkdir -p ../libgit2/build
@@ -80,12 +100,17 @@ jobs:
         - ./tools/aws_tasks.sh setup
 
       script:
+        - ls /usr/local/opt
         - tools/deploy_fritzing_mac.sh
         - cp ../deploy-app/Fritzing.dmg $HOME/$TRAVIS_BUILD_NUMBER/fritzing-"$TRAVIS_COMMIT"-debug-continuous-$TRAVIS_BUILD_NUMBER.10.1.dmg
 
+      after_success:
+        - ./tools/aws_tasks.sh synchronize_up
+
     - stage: build_and_pack
       os: windows
       language: cpp
+
       env:
         # - NMAKE_PATH="/c/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin/amd64/"
         # /c/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin/amd64/nmake.exe
@@ -101,7 +126,7 @@ jobs:
         - (mkdir ../libgit2/build64 && cd ../libgit2/build64 && cmake -G "Visual Studio 15 2017 Win64" .. && cmake --build . --config Release)
         - (cd src/lib && curl -L https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 | tar xj)
         # - mkdir -p ~/$TRAVIS_BUILD_NUMBER
-        # TODO aws cli can be installed, but PATH is not set correctly. This is *way more* complicated to get right than it should be.
+        # TODO aws cli can be installed, but PATH is not set correctly. Its more difficult than it sounds.
         # - ./tools/aws_tasks.sh setup
 
       script:
@@ -112,8 +137,6 @@ jobs:
           # - export PATH="$NMAKE_PATH:$RC_PATH:$PATH"
           #- cp ..\release*\* ~/$TRAVIS_BUILD_NUMBER
 
-      after_success:
-
     - stage: deploy_to_github
       before_install:
         - mkdir -p "$HOME/$TRAVIS_BUILD_NUMBER"
@@ -136,7 +159,3 @@ jobs:
 
       after_deploy:
          - ./tools/aws_tasks.sh cleanup
-      after_success:
-
-after_success:
-  - ./tools/aws_tasks.sh synchronize_up