Merge remote branch 'upstream/master' into feature/jdbc

Conflicts:
	README.md

README.md

@@ -87,19 +87,13 @@ To manage users, roles and permissions:
       password => 'foo',
     }
 
-Usage
------
-
-### postgresql::java
-Installs postgresql bindings for java.
-
-```Puppet
-class { 'postgresql::java': }
-```
-
-
-Automated testing
------------------
+    postgresql::database_grant{'test1':
+      privilege   => 'ALL',
+      db          => 'test1',
+      role        => 'dan',
+    }
+
+In this example, you would grant ALL privileges on the test1 database to the user or group specified by dan.
 
 At this point, you would just need to plunk these database name/username/password values into your PuppetDB config files, and you are good to go. 
 
@@ -153,6 +147,15 @@ The name of the postgresql client package.
 ####`package_ensure`
 The ensure parameter passed on to postgresql client package resource. 
 
+###postgresql::java
+This class installs postgresql bindings for Java (JDBC). Alter the following parameters if you have a custom version you would like to install (Note: don't forget to make sure to add any necessary yum or apt repositories if specifying a custom version):
+
+####`package_name`
+The name of the postgresql java package.
+
+####`package_ensure`
+The ensure parameter passed on to postgresql java package resource.
+
 ### Custom Functions
 
 If you need to generate a postgres encrypted password, use `postgresql_password`. You can call it from your production manifests if you don’t mind them containing the clear text versions of your passwords, or you can call it from the command line and then copy and paste the encrypted password into your manifest: