Use EC2_ for ec2-instance-env variables
Don't call ec2-instance-env before it's needed
First pass at adding --description