Fixed issues with improper conditional closings (if/endif, etc.).
Merge branch 'master' of github.com:blarghmatey/aws-formula
Merge branch 'prod'
Merge branch 'prod'
Added availability zone parameter
Merge branch 'prod'
Merged prod
Wrapped availability zones in an if block and set default value to None