`.travis.yml` is in the diff probably because I did pull instead of rebase. Do you know how to remove it from diff?