smarty support, grep plugin
Merge branch 'master' of https://github.com/schimpf/vim
cleanup conflict