Add some comments and remove nicks from the shipped config