Refactor CLI to use the API provided by commander

Commander seems to have a nice API for creating commands. No need to roll our own.