Worked through the final compile and linking errors from the upgrade from 3.6 to 3.7.
These errors had been generated when compiling the swig subdirectory, one was an include error
that I fixed by generating a new standard module with gr_modtool, and diffing the CMakeLists.txt
files with the newly generated one.  Was finally able to track down most of the errors I was
getting.  Also updated the include statements in the *_swig.i files to point to the correct files
in the new directory structure.  It now compiles!