updates to vimrc and aliases
merge commit