This pull requests refactors the pistol configuration options, since the current options are deficient in a few ways. Closes #3486
Matthew Toohey