Fix travis

This updates the broken Gemfile.lock and tests against ruby 2 and 2.1.