Merge branch 'next'

* next:
  Cache the gems used in the tests in Travis.
  Tie down the webmock version number more carefully.
  Add the test-unit gem so that we can test in ruby 2.2.
  Fix time-based tests for timezone changes (again).