Unlocking keychain with timout when provisioning

Squashed commit of the following:

commit bae11b7172caf88f0c34cbdc97a4d91c2db68f23
Author: Alex Fish <fish@ustwo.co.uk>
Date:   Fri Aug 29 17:21:23 2014 +0100

    Setting version 0.7

commit 3d8afb446c7dcee1c2ef7c845ff3b41c10b49eb6
Author: Alex Fish <fish@ustwo.co.uk>
Date:   Fri Aug 29 17:10:32 2014 +0100

    Unlocking keychain and setting timeout
Merge branch 'master' into feature/deploy

Conflicts:
	lib/tug/version.rb