Merge pull request #44 from tvansteenburgh/master

Make sure deployer doesn't timeout before amulet
Explicitly cast timeout to string
Merge branch 'master' of github.com:tvansteenburgh/amulet