Remove ruby 2.0.0 tests again; I think Travis runs both tests on the same box
Clean up Gemfile
Format Client CLI integration a bit