Make sure deployer doesn't timeout before amulet

Pass the (slightly increased) setup() timeout value through to deployer to ensure that the default deployer timeout (45min) doesn't abort the deployment before we want it to.

Also fixed a minor issue with version parsing that popped up on the current juju release, which doesn't have a patch revision number.