update cdm to use jcommander complex commands

[rustyrazorblade]

I almost have this done in my branch just need to patch up a couple things

http://jcommander.org/#Complex