rewrite post-merge to auto-generate tinc config
refactor post-merge hook
Merge branch 'frosty-geek-feature_auto_conf'