Update hgrc to be closer to Etienne's