vimrc: pulled changes from laptop branch