Organize default configuration file
Organize default configuration file

Add a missing `PostMerge` key and sort the types by name.

Change-Id: I1ee04e04acad8bc40d83623ab7deb4fcc23e6809
Reviewed-on: http://gerrit.causes.com/46989
Tested-by: jenkins <d95b56ce41a2e1ac4cecdd398defd7414407cc08@brigade.com>
Reviewed-by: Shane da Silva <67fb7bfe39f841b16a1f86d3928acc568d12c716@brigade.com>

TheSooth/overcommit,blech75/overcommit,oxocode/overcommit,blech75/overcommit,gnagel/overcommit,oxocode/overcommit,gnagel/overcommit,TheSooth/overcommit