Merge pull request jtriley#601 into develop

Author: jtriley

starcluster/static.py

@@ -126,7 +126,11 @@ def create_sc_config_dirs():
     'm3.large': ['x86_64'],
     'm3.xlarge': ['x86_64'],
     'm3.2xlarge': ['x86_64'],
+    'm4.xlarge': ['x86_64'],
+    'm4.2xlarge': ['x86_64'],
+    'm4.4xlarge': ['x86_64'],
     'm4.10xlarge': ['x86_64'],
+    'm4.16xlarge': ['x86_64'],
     'r3.large': ['x86_64'],
     'r3.xlarge': ['x86_64'],
     'r3.2xlarge': ['x86_64'],
@@ -183,7 +187,8 @@ def create_sc_config_dirs():
                     'c3.8xlarge']
 
 M4_COMPUTE_TYPES = ['c4.large', 'c4.xlarge', 'c4.2xlarge', 'c4.4xlarge',
-                    'c4.8xlarge', 'm4.10xlarge']
+                    'c4.8xlarge', 'm4.xlarge', 'm4.2xlarge', 'm4.4xlarge',
+                    'm4.10xlarge', 'm4.16xlarge']
 
 I2_STORAGE_TYPES = ['i2.xlarge', 'i2.2xlarge', 'i2.4xlarge', 'i2.8xlarge']