Fix travis by running apt-get update first
Merge branch 'travis-fix'