Merge branch 'travis_cleanup' of https://github.com/sitsofe/fio