Revert travis file back to pre-puppet 3.5