Make cmdline output wrap. Remove printf debug that accidentally made its way into the tree
Merge master back into branch