Graceful redeploy

@hiwaylon Can you take a look? I need to do some testing in Vagrant, but I think the code is ready to look at, overall.