Add retries for cookbook uploads to allow for failure due to chef-server readiness
Client recipe includes configurator so remove conditional inclusion from default
Merge any nested chef_server attributes prior to chef-server inclusion
Default remote backup connection to hash by default (#2)