Merge in upstream changes; add some features to vimrc
Update vimrc
Merge yay