Use jpalardy fork of spacehi vim plugin

and get rid of my hacks for MacVim, which are no longer necessary
Add delimitMate and closetag vim plugins