diff --git a/config/nginx.newsblur.conf b/config/nginx.newsblur.conf
index 2657d2279..37b36317e 100644
--- a/config/nginx.newsblur.conf
+++ b/config/nginx.newsblur.conf
@@ -10,17 +10,7 @@ upstream icon_server {
 
 server {
     listen   80;
-    listen   443 default_server ssl;
 
-    # ssl                     on;
-    ssl_certificate         /srv/newsblur/config/certificates/newsblur.com.pem;
-    ssl_certificate_key     /srv/newsblur/config/certificates/newsblur.com.key;
-    ssl_ciphers "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA";
-    ssl_prefer_server_ciphers on;
-    ssl_session_cache shared:SSL:10m;
-    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
-
-    ssl_dhparam     /srv/newsblur/config/certificates/dhparams.pem;
     client_max_body_size 4M;
     server_name www.newsblur.com newsblur.com dev.newsblur.com push.newsblur.com *.newsblur.com circularapp.com *.circularapp.com;
     add_header X-nginx-server nginx_none;
diff --git a/fabfile.py b/fabfile.py
index 6659452f5..f636e12e1 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -1328,7 +1328,7 @@ def setup_redis(slave=False):
 def setup_munin():
     sudo('apt-get update')
     sudo('apt-get install -y munin munin-node munin-plugins-extra spawn-fcgi')
-    # put('config/munin.conf', '/etc/munin/munin.conf', use_sudo=True) # Only use on main munin
+    put('config/munin.conf', '/etc/munin/munin.conf', use_sudo=True) # Only use on main munin
     put('config/spawn_fcgi_munin_graph.conf', '/etc/init.d/spawn_fcgi_munin_graph', use_sudo=True)
     put('config/spawn_fcgi_munin_html.conf', '/etc/init.d/spawn_fcgi_munin_html', use_sudo=True)
     sudo('chmod u+x /etc/init.d/spawn_fcgi_munin_graph')