Use RubyGems 2.2.1 for Travis.

Travis is currently defaulting to 2.2.0 which seems to be buggy on
Ruby 1.8.7.
Merge remote-tracking branch 'origin/master'