--- a/configuration/configuration.py	Wed Mar 28 08:29:50 2012 -0700
+++ b/configuration/configuration.py	Wed Mar 28 08:33:54 2012 -0700
@@ -345,14 +345,14 @@
 
         # get CLI configuration options
         cli_config = dict([(key, value) for key, value in options.__dict__.items()
-                           if key in self.options and key in parser.parsed])
+                           if key in self.options and key in self.parsed])
 
         # deserialize configuration
         configuration_files = getattr(options, 'load', args)
         missing = [i for i in configuration_files
                    if not os.path.exists(i)]
         if missing:
-            parser.error("Missing files: %s" % ', '.join(missing))
+            self.error("Missing files: %s" % ', '.join(missing))
         config = []
         for f in configuration_files:
             try:
@@ -378,6 +378,9 @@
             # XXX assuming if you don't have values you were just dumping
             raise missingvalues
 
+        # update options from config
+        options.__dict__.update(self.config)
+
         # return parsed arguments
         return options, args