CLC-1220 Do all our sleeping in start-trinidad.sh instead of in deploy.rb
Merge pull request #669 from ctweney/clc-1220-initd

CLC-1220 Do all our sleeping in start-trinidad.sh instead of in deploy.rb