Move vimrc out from .vim/ dir. Remove .vim/ dir, no longer needed.