Merge pull request #2412 from kryptek/master

Add new AWS EC2 flavors to the compute model