Consolidate to .vimrc, minor updates