fix ami generation, also add initial changes for C* 2.0
AMI generation fix, more off-by-ones in getting values out of the tab delimited output. Not sure how this escaped testing last week.
Merge branch 'develop' of github.com:viafoura/buri into develop