Merge branch '0000-ruby-client-config'
authorTom Clegg <tom@curoverse.com>
Tue, 29 Apr 2014 20:01:20 +0000 (16:01 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 29 Apr 2014 20:01:20 +0000 (16:01 -0400)

Trivial merge