git | diff tool
update vim template
vimrc | new plugin
git | merge