[20180824133029] S3 Encryption and Bug Fixes

[ddollar]

• #2866 cleanup and refactor directory tree [@ddollar]
• #2870 encrypt s3 buckets by default [@ddollar]
• #2872 restore recordset to top level stack to avoid cloudformation deleting it [@ddollar]