Change argument handling to match usage

Change argument handling of output-dir to match usage
Merge pull request #23 from halfnelson/patch-1

Change argument handling to match usage