Now testing puppet 3.6, dropping 3.1
Merge pull request #16 from solarkennedy/master

Now testing puppet 3.6, dropping 3.1