Merge pull request #31 from sargon/master

kiel: Cleanup of keys.
rewrite post-merge to auto-generate tinc config
add darmstadt1
Added darmstadt2
Merge remote-tracking branch 'ffda/master'
Merge pull request #33 from freifunk-darmstadt/master

Add darmstadt1/darmstadt2
refactor post-merge hook
Merge branch 'frosty-geek-feature_auto_conf'
kiel: Remove kiel1

The system is no longer acting as a icvpn peer