git: editor=vim
Merge branch 'master' of github.com:mattjbray/dotfiles
xinitrc: stalonetray
vim: don't regenerate ropeproject
vim: <leader>m -> dispatch