getting rid of that awful is a tty check
Merge branch 'master' of github.com:mfisk/filemap
help output would break if options didn't have a long option in addition to the short, this is now fixed