Revert "Try another kind of travis build"

This reverts commit 75d989f97a.

.travis.yml

@@ -1,3 +1,4 @@
+sudo: required
 language: cpp
 
 before_install:    
@@ -5,7 +6,8 @@ before_install:
     - export CXXFLAGS="$CXXFLAGS -DTRAVIS"
 
 install:
-    - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi
+    - sudo apt-get install -qq libwxgtk3.0-dev libwxgtk3.0-0 libssh2-1-dev
+    - if [ "$CXX" = "g++" ]; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 98; fi
 
 # Build with both gcc and clang
 compiler:
@@ -17,9 +19,6 @@ addons:
         sources:
         - ubuntu-toolchain-r-test
         packages:
-        - libwxgtk3.0-dev
-        - libwxgtk3.0-0
-        - libssh2-1-dev
         - gcc-4.8
         - g++-4.8
         - clang