Merge pull request #333 from puppetlabs/travisci_update
Updated travisci file to do testing for Puppet 4