Merge pull request #14 from abuxton/master

if defind statement added to work around currently broken puppet module...
Update Beaker env var names
BEAKER_SET doesn't appear to be the right env var
Now testing puppet 3.6, dropping 3.1
Merge pull request #16 from solarkennedy/master

Now testing puppet 3.6, dropping 3.1