Added examples to upload rspec tests

Added examples  to upload rspec tests that show client_name and
client_key options cannot be passed in for connecting to the chef server
Fixed code style violations I introduced
Add client_name and client_key options to upload

Added client_name and client_key options to the upload method of
berksfile.rb.  Prior to this change,  you could specify a chef server in
the options, but the credentials used for the connection were read only
from the config.json.   changeset 2decca9 added tests that show you
can't pass these options in.  (The tests were failing.  This commit
fixes those tests)
Updated expectations in berksfile_spec.rb

I cherry picked a changeset into master that added a couple of examples
to berksfile_spec.rb.  However, in master, the way ridley connections
were being opened had changed in a way that broke the examples.
Merge pull request #818 from keiths-osc/master

Allow chef client name and key to be overridden for cookbook uploads