Changes in shutdown function in main so that 'force' and 'kill' options have a behavior more consistent
Fixed startup sequence
Merge branch 'future' of github.com:wallix/redemption into future
Fixed startup sequence