VIM: Some cleanups on vimrc
Updated OMZ