Feature/vimrc cleanup