Minor reorg in cross validation.  Added nmr_tools.