Merge pull request #74 from jrrideout/death-march

Cleaned up command-line parsing code
Fixed %default