Removing horrible themes, and easing vim-tmux integration
Tmux configuration load for merge
Merge both branches