Merging recent bash alias and .vimrc changes