Reconciling changes between my desktop vimrc and my laptop one