Update vimrc with a few new tweaks

Tested-on: magrathea <11 Nov 2014>