Updating CF templates with correct defaults, and new AMIs for Simian
Army