add puppet support, update amazon instance types
puppet test-kitchen changes