More cleanup, add iterm2 to mackup conf