Fix svn2git on large repos by extending the timeout that we wait for fast-import from 30s to 1h.

Also don't use the ports version, as it doesn't have the project branch merge hack. While here
clean up some legacy names.