updated for aws ami and python 2.6 compat