correctly starting nginx in cases where it is not initially running
Merge pull request #789 from shatterednirvana/properly-starting-nginx

correctly starting nginx in cases where it is not initially running
Merge remote-tracking branch: upstream/master