tmux, vimrc needs merging
git - better diff