Bugfix Travis testing ruby 1.8.7 and add Puppet 3.4.2
Fix merge conflict