Fix commandline overrides of config file settings
Fix commandline overrides of config file settings

Command line options should only override the config file if they are
explicitly specified.

JoseKilo/bucky,trbs/bucky,CollabNet/puppet-bucky,MrSecure/bucky2,dimrozakis/bucky,CollabNet/puppet-bucky,JoseKilo/bucky,MrSecure/bucky2,CollabNet/puppet-bucky,dimrozakis/bucky,trbs/bucky,Hero1378/bucky,CollabNet/puppet-bucky,jsiembida/bucky3,ewdurbin/bucky,ewdurbin/bucky,Hero1378/bucky