setting tomcat version to 7, updates to CFN including S3 bucket creation, renaming ci-chef.template to jenkins.template