Err..followup on that misc updates.

This contains most of that hgrc change referenced in the last commit