Deprecated --non-daemon to --no-detach
Merge pull request #680 from hjoliver/no-detach-option-name

Deprecated --non-daemon to --no-detach