various updates to vimrc over xmas