diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d6150aed34..085c197fa4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,13 @@
 CHANGELOG
 =========
 
+0.0.19
+======
+* feature:``cli``: Added configure command; easy config setup
+* updates:``docs``: Addtional documentation for configuration options
+* updates:``ami``: Pulled latest CentOS6 errata
+* bugfix:``cfncluster``: Fixed issue with nodewatcher not scaling down
+
 0.0.18
 ======
 * updates:``ami``: Custom CentOS 6 kernel repo added, support for >32 vCPUs
diff --git a/amis.txt b/amis.txt
index 83030df39f..87d31ad580 100644
--- a/amis.txt
+++ b/amis.txt
@@ -1,10 +1,10 @@
-us-west-2 ami-87de82b7
-eu-central-1 ami-8c97a791
-sa-east-1 ami-2bdd6036
-ap-northeast-1 ami-a8d8c8a9
-eu-west-1 ami-f738be80
-us-east-1 ami-4ad6a522
-us-west-1 ami-298e916c
-ap-southeast-2 ami-efc4aed5
-ap-southeast-1 ami-705a7222
-us-gov-west-1 ami-5fcfa97c
+us-west-2 ami-ab7f599b
+eu-central-1 ami-b43705a9
+sa-east-1 ami-818b359c
+ap-northeast-1 ami-891bfb89
+eu-west-1 ami-87fd69f0
+us-east-1 ami-7660361e
+us-west-1 ami-86b0aac3
+ap-southeast-2 ami-7d730547
+ap-southeast-1 ami-fafcc8a8
+us-gov-west-1 ami-5d68097e
diff --git a/cli/cfncluster/easyconfig.py b/cli/cfncluster/easyconfig.py
index d4d6f81f59..fe0798f157 100644
--- a/cli/cfncluster/easyconfig.py
+++ b/cli/cfncluster/easyconfig.py
@@ -129,7 +129,7 @@ def configure(args):
         config_read = True
    
     # Prompt for required values, using existing as defaults 
-    cluster_template = prompt('Cluster Name', config.get('global', 'cluster_template') if config.has_option('global', 'cluster_template') else 'default')
+    cluster_template = prompt('Cluster Template', config.get('global', 'cluster_template') if config.has_option('global', 'cluster_template') else 'default')
     aws_access_key_id = prompt('AWS Access Key ID', config.get('aws', 'aws_access_key_id') if config.has_option('aws', 'aws_access_key_id') else None, True)
     aws_secret_access_key = prompt('AWS Secret Access Key ID', config.get('aws', 'aws_secret_access_key') if config.has_option('aws', 'aws_secret_access_key') else None, True)
 
diff --git a/cli/setup.py b/cli/setup.py
index edce590878..1a1bebd152 100644
--- a/cli/setup.py
+++ b/cli/setup.py
@@ -20,8 +20,8 @@ def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
 console_scripts = ['cfncluster = cfncluster.cli:main']
-version = "0.0.99"
-requires = ['boto>=2.35.1'] 
+version = "0.0.19"
+requires = ['boto>=2.36'] 
 
 if sys.version_info[:2] == (2, 6):
     # For python2.6 we have to require argparse since it
diff --git a/cloudformation/cfncluster.cfn.json b/cloudformation/cfncluster.cfn.json
index 17a3519945..0c9cee98d3 100644
--- a/cloudformation/cfncluster.cfn.json
+++ b/cloudformation/cfncluster.cfn.json
@@ -720,35 +720,35 @@
       }
     },
     "AWSRegionOS2AMI" : {
-      "eu-west-1" : {
-        "centos6" : "ami-f738be80"
+      "us-west-2" : {
+        "centos6" : "ami-ab7f599b"
       },
-      "us-east-1" : {
-        "centos6" : "ami-4ad6a522"
+      "eu-central-1" : {
+        "centos6" : "ami-b43705a9"
+      },
+      "sa-east-1" : {
+        "centos6" : "ami-818b359c"
       },
       "ap-northeast-1" : {
-        "centos6" : "ami-a8d8c8a9"
+        "centos6" : "ami-891bfb89"
       },
-      "us-west-2" : {
-        "centos6" : "ami-87de82b7"
+      "eu-west-1" : {
+        "centos6" : "ami-87fd69f0"
       },
-      "sa-east-1" : {
-        "centos6" : "ami-2bdd6036"
+      "us-east-1" : {
+        "centos6" : "ami-7660361e"
       },
       "us-west-1" : {
-        "centos6" : "ami-298e916c"
-      },
-      "ap-southeast-1" : {
-        "centos6" : "ami-705a7222"
+        "centos6" : "ami-86b0aac3"
       },
       "ap-southeast-2" : {
-        "centos6" : "ami-efc4aed5"
+        "centos6" : "ami-7d730547"
       },
-      "eu-central-1" : {
-        "centos6" : "ami-8c97a791"
+      "ap-southeast-1" : {
+        "centos6" : "ami-fafcc8a8"
       },
       "us-gov-west-1" : {
-        "centos6" : "ami-5fcfa97c"
+        "centos6" : "ami-5d68097e"
       }
     },
     "ClusterUser" : {
@@ -1819,7 +1819,7 @@
                       {
                         "Fn::GetAtt" : [
                           "MasterServer",
-                          "PrivateIp"
+                          "PrivateDnsName"
                         ]
                       },
                       "\n",