New version.  Also testing emacs vc mode