Merge branch 'develop' into eks-with-nodegroup

# Conflicts:
#	requirements.txt

Author: dpoirier

requirements.txt

@@ -1,5 +1,5 @@
 awacs==0.9.6
-troposphere==2.5.3
+troposphere==2.6.0
 flake8==3.4.1
 isort==4.2.15
 sphinx==1.6.7

stack/__init__.py

@@ -1,3 +1,4 @@
+import datetime
 import os
 
 USE_DOKKU = os.environ.get("USE_DOKKU") == "on"
@@ -45,4 +46,13 @@
 # Must be last to tag all resources
 from . import tags  # noqa: F401
 
+# Since we're outputting YAML, we can include comments
+print("# This Cloudformation stack template was generated by")
+print("# https://github.com/caktus/aws-web-stacks")
+print("# at %s" % datetime.datetime.now())
+print("# with parameters:")
+use_parms = sorted(parm for parm in os.environ.keys() if parm.startswith("USE_"))
+for parm in use_parms:
+    print("#\t%s = %s" % (parm, os.environ[parm]))
+print()
 print(template.template.to_yaml())