new AMIs with R cluster timeout
Merge branch 'develop' of github.com:NREL/OpenStudio into develop