add zaw source, cleanup vimrc