refactored vimrc, big cleanup