diff --git a/README.rst b/README.rst
index 95808188..70c73764 100644
--- a/README.rst
+++ b/README.rst
@@ -1,11 +1,11 @@
-PyWb 0.6.0
+PyWb 0.6.1
 ==========
 
-.. image:: https://travis-ci.org/ikreymer/pywb.png?branch=master
+.. image:: https://travis-ci.org/ikreymer/pywb.png?branch=develop
       :target: https://travis-ci.org/ikreymer/pywb
          
-.. image:: https://coveralls.io/repos/ikreymer/pywb/badge.png?branch=master
-      :target: https://coveralls.io/r/ikreymer/pywb?branch=master
+.. image:: https://coveralls.io/repos/ikreymer/pywb/badge.png?branch=develop
+      :target: https://coveralls.io/r/ikreymer/pywb?branch=develop
 
 pywb is a python implementation of web archival replay tools, sometimes also known as 'Wayback Machine'.
 
diff --git a/config.yaml b/config.yaml
index 1ab3063e..2d8aee7f 100644
--- a/config.yaml
+++ b/config.yaml
@@ -56,12 +56,12 @@ enable_http_proxy: true
 # use wildcard certificates when creating certs in proxy mode
 # helps lower number of certs created, by may not be compatible
 # with older libraries
-#   use_wildcard_certs: true
+#    use_wildcard_certs: true
 
 # if true, will not add any banner to proxy mode replay
-#   unaltered_replay: false
+#    unaltered_replay: false
 
-# Default settings for CA used by proxy mode
+# Default settings for CA used by proxy mode:
 #    root_ca_file: ./ca/pywb-ca.pem
 #    root_ca_name: pywb https proxy replay CA
 #    certs_dir: ./ca/certs
diff --git a/pywb/ui/proxy_cert_download.html b/pywb/ui/proxy_cert_download.html
index 66044523..b3f51a14 100644
--- a/pywb/ui/proxy_cert_download.html
+++ b/pywb/ui/proxy_cert_download.html
@@ -1,14 +1,13 @@
 <h2>HTTPS Certificate For PyWb Web Archive Replay</h2>
 {% if not available %}
 <p>Sorry, HTTPS support is not configured for this proxy. However, the proxy should work in HTTP mode.</p>
+
 {% else %}
 <p>Download for all platforms except Windows (or Firefox on Windows):</p>
 <p><b><a href="{{ pem_path }}">Download Certificate (All except Windows)</a></b></p>
 
 <p>(If you see the <i>Already Installed</i> message, then no further action is necessary and you may start browsing!</p>
-{% endif %}
 
 <p>Download for Windows platforms (except if using Firefox. For Firefox, use the above download, even on Windows):</p>
 <p><b><a href="{{ p12_path }}">Download Certificate (Window Only)</a></b></p>
-
-
+{% endif %}
diff --git a/setup.py b/setup.py
index ce73017b..482e5c78 100755
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ class PyTest(TestCommand):
 
 setup(
     name='pywb',
-    version='0.6.0',
+    version='0.6.1',
     url='https://github.com/ikreymer/pywb',
     author='Ilya Kreymer',
     author_email='ikreymer@gmail.com',