Merge pull request #58 from derekwaynecarr/reboot_on_create_ami

Increase timeout for broker build
Merge pull request #59 from derekwaynecarr/reboot_on_create_ami

Do not clean bare repos in geard environment
Do not always build the broker-builder