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
d14f4b41645281626272a40340bdcc0b074d6248 added tests that show you can't
pass these options in.  (The tests were failing.  This commit fixes
those tests)
Merge pull request #817 from keiths-osc/ridley_connection_fix

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