Get everything building without errors.  Fix hgrc thing.