Fix some of the new rubocop guidelines
Bump puppet 3.5 version for travis to use