Fixed bug: mergeplan in config file was ignored. Reported in #22 Added test cases for cmdline parsing. Added test cases for configfile parsing.