some adjustments. i am finding git merge to be quite used now that i have two
parallel vimrc branches that share a lot of items.