Updated dictionary keys for vcs_metadata and fixed hg version command