Add EC2 to "new config" dicts

This may resolve #439. @fredvd, would you please verify?