Misc. improvements for vimrc
vim: InsertHeaderGuard improvements