Remove hg from integration tests; git is defacto standard at this point
Fix missing call to cwd_predirs