Makefile: fix git dep for multiple remotes
configure: backup prev. config.inc, take args
Merge remote-tracking branch 'origin/master' into p2