Move from using commandMaps to -options

This was done as it should make the function more easily extensible and
creates a nice interface.
Refactor parseConfig