fix bug 1094720; tidy repo cfg, etc

@rhelmer `r?`