Fix issues with travis config

Former-commit-id: da7e54819afd78ff58a1f03a7e4aee0a12b94bbb

.travis.yml

@@ -1,9 +1,3 @@
-install: make nasm get-deps
-
-compiler:
-        - clang
-        - gcc
-
 language: generic
 os: osx
 matrix:
@@ -14,6 +8,7 @@ matrix:
         apt:
           packages:
             - g++-5
+            - nasm
           sources: &sources
             - llvm-toolchain-precise-3.8
             - ubuntu-toolchain-r-test
@@ -23,4 +18,5 @@ matrix:
         apt:
           packages:
             - clang-3.8
+            - nasm
           sources: *sources