Setup uniquify properly, no-need to commit the auto-generated crap