Minor changes to the toplevel Makefile.  Uses make -C instead of cd && make