disable git_diff_wrapper
Merge branch 'master' of github.com:sethtrain/dotfiles
use gvim for x tmuxinator