Add wait_for time
Specify server name
Merge branch 'refs/heads/master' into travisify