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