reverting api to the state it was in before the defensive-api-changes
Merge branch 'master' of github.com:cbdr/ruby-cb-api into defensive-api-changes
merging in Chris's fix for the api.rb cb_response deal
fixed merge conflicts