saltstack/salt — pull request #820 by dcolish (2012-03-03 07:08:36+00:00)
Title: Refactor of cli parsers, normalize around conf_file

Also a bonus removal of an unused var.