Remove workaround for rubygems 2.2.0 in Travis
Add puppet 3.5 to the travis matrix

Exclude ruby 2.1 for puppet < 3.5.0