exe/caravan in caravan-0.5.0.alpha1 vs exe/caravan in caravan-0.5.1

@@ -44,8 +44,11 @@
 if ARGV.size == 1 && ARGV[0] == "init"
   Caravan.dump_default_conf
 end
 
 option_parser.parse!(ARGV)
-if options.key?(:src) && options.key?(:dst)
-  Caravan.start(options)
+merged_conf = Caravan::Config.merge(options, Caravan.process_conf(options[:src]))
+if merged_conf.key?('src') && merged_conf.key?('dst') && merged_conf.key?('deploy_mode')
+  Caravan.start(merged_conf)
+else
+  Caravan::Message.error('No src, dst, deploy_mode specified. Cannot deploy.')
 end