Update safetyzone model.

- also make definitions less verbose again
- resolves #28
2 jobs for master in 6 minutes and 3 seconds (queued for 3 seconds)