Merge pull request #30 from opscode/adamed-knife-383

KNIFE-383: config values should not take precedence over command line options