Merging master into dev (master was ahead)

Merging the AWS code and the removed sensitive date into the dev branch
as it was committed straight to master. This should sync everything
back up