Attempt to fix script exit status reporting
Merge branch 'ami-builder'
Set version number