Update vimrc to match the state of #1485

This branch should probably be updated as necessary to follow #1485