Fixed travis for uvcdat/master
Merge remote-tracking branch 'origin/fix_travis_for_master'