Rolling back vim/tmux integration
Fixing merge tools
Adding some git helpers