new plugin, conqueterm, but need to fix gvimrc
Merge branch 'master' of https://github.com/tonyfischetti/tony-vim

I messed up