bump timeout on highstates
Make timeout variable
Merge pull request #38 from ministryofjustice/salt-timeout

Bump timeout on highstates
Not timeout option for salt-call
Merge pull request #39 from ministryofjustice/timeout-fix

No timeout option for salt-call
Add metadata on AWS box creation
Set hostname when creating servers