Fixed issues with improper conditional closings (if/endif, etc.).
Updated directory structure of formula. Added cloudwatch state.
Merge branch 'prod' of github.com:blarghmatey/aws-formula into prod