make options consistent across commands
Merge pull request #1877 from jekyll/maul-esel-consistent-opts