A more generic way of handling path conflicts.
Merge branch 'master' of github.com:mxcube/mxcube