Update .vimrc, some slight formatting, personal flavor editing