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

A very minor change - I think ```--no-detach``` is better/more "standard" than ```--non-daemon```. The latter still works in case anyone is using it though.

@arjclark et. al. - please review.