make clean now removes build stuff
fixes #2: discoursegraphs script now points to the merging.py cli