puppetlabs/beaker — pull request #25 by anodelman (2013-10-03 16:32:39+00:00)
Title: fix for not using --keyfile specified in an options file

Had some leftover magic in command_line_parser that needed to be moved to general parsing so that it is also used for options file parsing.