Add a configurable delay before configuration
Merge branch 'ami-builder'
Set version number