Updating with some notes on AWS
Merge remote-tracking branch 'origin/feature/brian_1.2_features' into feature/brian_1.2_features