updates and cleanup to vimrc