Update Puppet and Ruby versions in the Travis matrix
Merge branch 'master' into vagrant