[DONOTMERGE] Improve Python 3 compat, clean up code

Further improve compatibility with Python 3 by making the `urlparse` import
conditional.

Make some sed expressions use "|" as a separator instead of "/", thus allowing
all occurrences of "\/" to be removed.

Update some comments and shuffle around code to make it more compact and
readable. Add some FIXMEs.
When creating a bare repo a common pattern is to append `.git` in the file name, as github does for example.