Completely untested "merge" of p4-fast-export.py into git-p4.py