Refactor the building of git2.nci and fix a bug in 'make clean'
De-duplicate conf folder