Simplify mkconf to be repo and branch agnostic