update script paths etc and abcde conf
update script paths etc and abcde conf, merge cleanup