fixing a bunch of small issues

Fixing some compile errors related to concatenation, an analysis bug and adding --pwd option to rivet-merge

Fixes #172 (closed), #173 (closed), #174 (closed)