Modified to correctly support yaml
Merge branch 'master' of https://github.com/adnichols/tmux-and-vim