Working CloudFormation deployment

Currently doesn't deal with different environments properly