Update Puppet build versions for travis
Get rid of the underscore prefixed variables that don't work with the future parser
Merge branch 'master' into issue-23
Merge pull request #31 from rodjek/issue-23

Fix for use with the future parser

Fixes #23