Move vcs stuff into init-vcs.  Refactor a little too :)