Merge pull request #1 from spul/master

Remove positional arguments in favor of getopts
Fix up data directory usage