Add skeleton for case where only one command in the pipeline.
Make changes to Makefile for debug build.
Merge our versions of main.c; just had slightly different includes.
Remove all these .nfs* files (what?); Delete some git merge gibberish from main.c.