various updates to vimrc and aliases