Pulled in dshaw's Command LIne Improvements

* pulled in https://github.com/bcoe/routers-news/pull/3
* made a couple more changes along the same lines.