Various vim updates/cleanup
Merge pull request #1 from rcdilorenzo/master

Various vim updates/cleanup