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

Bump timeout on highstates