diff --git a/README.rst b/README.rst
index e434f3e..773d3f3 100644
--- a/README.rst
+++ b/README.rst
@@ -1,11 +1,19 @@
 
-===========
-Backupninja
-===========
+===================
+Backupninja formula
+===================
 
-Backupninja allows you to coordinate system backup by dropping a few simple configuration files into /etc/backup.d/. Most programs you might use for making backups don't have their own configuration file format.
+Backupninja allows you to coordinate system backup by dropping a few simple
+configuration files into /etc/backup.d/. Most programs you might use for
+making backups don't have their own configuration file format.
 
-Backupninja provides a centralized way to configure and schedule many different backup utilities. It allows for secure, remote, incremental filesytem backup (via rdiff-backup), compressed incremental data, backup system and hardware info, encrypted remote backups (via duplicity), safe backup of MySQL/PostgreSQL databases, subversion or trac repositories, burn CD/DVDs or create ISOs, incremental rsync with hardlinking.
+Backupninja provides a centralized way to configure and schedule many
+different backup utilities. It allows for secure, remote, incremental
+filesytem backup (via rdiff-backup), compressed incremental data, backup
+system and hardware info, encrypted remote backups (via duplicity), safe
+backup of MySQL/PostgreSQL databases, subversion or trac repositories, burn
+CD/DVDs or create ISOs, incremental rsync with hardlinking.
+
 
 Sample pillars
 ==============
@@ -59,11 +67,13 @@
       server:
         enabled: true
         rdiff: true
-        keys:
-        - client1.domain.com
+        key:
+          client1.domain.com:
+            key: ssh-key
 
-Read more
-=========
+
+More information
+================
 
 * https://labs.riseup.net/code/projects/backupninja/wiki/Configuration
 * http://www.debian-administration.org/articles/351
@@ -71,6 +81,7 @@
 * https://github.com/riseuplabs/puppet-backupninja
 * http://www.ushills.co.uk/2008/02/backup-with-backupninja.html
 
+
 Documentation and Bugs
 ======================
 
diff --git a/backupninja/client.sls b/backupninja/client.sls
index 2cac2b2..9757348 100644
--- a/backupninja/client.sls
+++ b/backupninja/client.sls
@@ -1,16 +1,6 @@
 {%- from "backupninja/map.jinja" import client, service_grains with context %}
 {%- if client.enabled %}
 
-{%- if pillar.postgresql is defined or pillar.mysql is defined %}
-include:
-{%- if pillar.postgresql is defined %}
-- postgresql
-{%- endif %}
-{%- if pillar.mysql is defined %}
-- mysql
-{%- endif %}
-{%- endif %}
-
 backupninja_packages:
   pkg.installed:
   - names: {{ client.pkgs }}
@@ -103,6 +93,7 @@
 {%- if client.target is defined %}
 
 {%- if client.target.engine in ["s3","dup",] %}
+
 backupninja_duplicity_packages:
   pkg.installed:
   - names:
@@ -117,13 +108,16 @@
   - group: root
   - require:
     - pkg: backupninja_packages
+
 {%- endif %}
 
 {%- if client.target.engine in ["rdiff",] %}
+
 backupninja_duplicity_packages:
   pkg.installed:
   - names:
     - rdiff-backup
+
 {%- endif %}
 
 backupninja_remote_handler:
@@ -142,6 +136,7 @@
     - pkg: backupninja_packages
 
 {%- if client.target.auth is defined and client.target.auth.gss is defined %}
+
 backupninja_gss_helper_kinit:
   file.managed:
   - name: /etc/backup.d/100.kinit.sh
diff --git a/backupninja/files/rdiff.conf b/backupninja/files/rdiff.conf
index 08fc92e..2e8bcb3 100644
--- a/backupninja/files/rdiff.conf
+++ b/backupninja/files/rdiff.conf
@@ -1,4 +1,4 @@
-{%- from "backupninja/map.jinja" import client with context %}
+{%- from "backupninja/map.jinja" import client, service_grains with context %}
 {%- from "linux/map.jinja" import system with context %}
 ##
 ## This is an example rdiff-backup configuration file.
diff --git a/backupninja/files/rsync.conf b/backupninja/files/rsync.conf
index e5d8126..d45b350 100644
--- a/backupninja/files/rsync.conf
+++ b/backupninja/files/rsync.conf
@@ -1,4 +1,4 @@
-{%- from "backupninja/map.jinja" import client with context %}
+{%- from "backupninja/map.jinja" import client, service_grains with context %}
 {%- from "linux/map.jinja" import system with context %}
 {%- from "linux/map.jinja" import network with context %}
 #
@@ -199,7 +199,7 @@
 
 # remote rsync program (remote dest only)
 {%- if grains.os == 'Ubuntu' and grains.osrelease >= '14.04' %}
-remote_rsync = '{% for backup_name, backup in service_grains.backupninja.backup.iteritems() %}{% for fs_include in backup.get('fs_includes', []) %}mkdir -p /srv/backupninja/{{ network.fqdn }}{{ fs_include }};{% endfor %}{% endfor %} rsync'
+# remote_rsync = '{% for backup_name, backup in service_grains.backupninja.backup.iteritems() %}{% for fs_include in backup.get('fs_includes', []) %}mkdir -p /srv/backupninja/{{ network.fqdn }}{{ fs_include }};{% endfor %}{% endfor %} rsync'
 {%- else %}
 #remote_rsync = rsync
 {%- endif %}