[KNIFE-273] honor command line over knife.rb settings

http://tickets.opscode.com/browse/KNIFE-273

Prior to this, the anything from knife.rb (ie flavor, image, etc) overrode options on the command line.
This seems to work for most settings I looked through and use regularly.