Revert "[vim] add "splice" plugin for 3-way merge conflict resolution in git"

This reverts commit ead756236bc4cfd632ed96441aba4bc7ea713e4d.
[vim] let indent guide select colors automatically
[vim] increased the font size in gvim
[vim] helper function to port old style PHP tags in to new style