Arg parser regex was too restrictive for dashes and underscores. Fixes #396.