Updating with latest code, updating example templates, adding the new aws.phar that works