another attempt at getting travis CI to use ruby 2.1

self-merging