diff --git a/.gitignore b/.gitignore
index 2ba6038290..c8271c9a52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ build
 dist
 heat.egg-info
 heat/vcsversion.py
+tags
diff --git a/README.rst b/README.rst
index 190bc0db54..711b5e69a4 100644
--- a/README.rst
+++ b/README.rst
@@ -34,8 +34,7 @@ shell2:
 
 shell3:
 
-    heat create my_stack --template-url=https://raw.github.com/heat-api/heat/blob/master/templates/WordPress_Single_Instance.template
-
+    heat create my_stack --template-url=https://raw.github.com/heat-api/heat/master/templates/WordPress_Single_Instance.template
 References
 ----------
 * http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_CreateStack.html
diff --git a/bin/heat b/bin/heat
index f2fcffc57f..a7796ac9c3 100755
--- a/bin/heat
+++ b/bin/heat
@@ -240,7 +240,7 @@ def jeos_create(options, arguments):
             auth_url=os.getenv('OS_AUTH_URL'),
             strategy=os.getenv('OS_AUTH_STRATEGY', 'noauth'))
 
-    c = glance_client.Client(host="0.0.0.0", port=9292,
+    client = glance_client.Client(host="0.0.0.0", port=9292,
             use_ssl=False, auth_tok=None, creds=creds)
 
     parameters = {
@@ -256,7 +256,7 @@ def jeos_create(options, arguments):
                   'owner': os.getenv('OS_AUTH_USER'),
                   'container_format': 'bare'}
 
-    images = c.get_images(**parameters)
+    images = client.get_images(**parameters)
     for image in images:
         if image['name'] == distro:
             print ' *** image already in glance: %s > %s' % (image['name'], image['id'])
@@ -264,7 +264,7 @@ def jeos_create(options, arguments):
 
     try:
         with open(qcow2_filename) as ifile:
-            image_meta = c.add_image(image_meta, ifile)
+            image_meta = client.add_image(image_meta, ifile)
         image_id = image_meta['id']
         print " Added new image with ID: %s" % image_id
         print " Returned the following metadata for the new image:"