Updating gemfile for travis; prior merge conflict fix lopped out something inapporpriately.