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