Print warning when both --output_file and --output_dir passed, exit if --output_dir does not exist.
Merge pull request #21 from jonathancrabtree/master

Improved option handling