use EC2 environment variables if set
Merge pull request #83 from briandrawert/develop

use EC2 environment variables if set