Merge remote-tracking branch 'martino/master'

diff --cc python/skytools/scripting.py
index 801d3d8f032698a3eece938bf6c7c0098148646a,3ed1e3d9c3caae954354978a6078e7a58a363492..9834e5888ec31a96e36718ce012ad0d52ccc8d25
--- 1/python/skytools/scripting.py
--- 2/python/skytools/scripting.py
+++ b/python/skytools/scripting.py
@@@ -350,10 -350,10 +350,10 @@@ class BaseScript(object)
              print("need config file, use --help for help.")
              sys.exit(1)
          conf_file = self.args[0]
 -        return skytools.Config(self.service_name, conf_file, override = self.cf_operride)
 +        return skytools.Config(self.service_name, conf_file, override = self.cf_override)
  
      def init_optparse(self, parser = None):
-         """Initialize a OptionParser() instance that will be used to 
+         """Initialize a OptionParser() instance that will be used to
          parse command line arguments.
  
          Note that it can be overrided both directions - either DBScript