Fix merge thingies in vimrc
/Users/wyatt -> $HOME