Make CloudFormation deploy more Stage friendly

Now default to adding -STAGE to stack name and add a stage
parameter to the map we pass to the template