Refactored .vimrc; cleaned up .vim dir