added TODOs, updated README

README.md

@@ -14,13 +14,13 @@ Currently the python implementation has the following submodules
     Version number of the script and the configuration given
 * auto\_amqp.py - the amqp connector class which provides the following
   functions:
-  * load\_conf(str) - loads and merges configuration from the given dictionary
+  * load\_conf(dict) - loads and merges configuration from the given dictionary
 
   * load\_conf\_file(fname) - loads and merges configuration directly from a file
 
   * create\_connection() - starts the connection the the AMQP Server
 
-  * [internal] \_setup\_tubes - creates the in 'config' configured input and output
+  * [internal] \_setup\_tubes() - creates the in 'config' configured input and output
     queues/exchanges. will be called by create_connection
     in addition it registers the following functions if input exchange is
     defined:
@@ -29,12 +29,11 @@ Currently the python implementation has the following submodules
     * start\_loop () - calls asyncore\_loop()
     the following function is registered if the output exchange is defined
     * publish (msg) - sends a message to the output exchange
+
   * close\_connection () - closes all connections, cleans up the object
   In addition to that, auto\_amqp.py needs to hold a "default parameter"
   list called DEFAULT\_CONFIG. 
 
-
-
 Dependencies
 ===========
 * simplejson 

TODO.md

@@ -0,0 +1,5 @@
+TODOs
+=====
+- in auto_amqp.py:
+  - make load_conf recursively merge "all" dictionaries in the
+    configuration file