Cleanup
.vimrc fixes