Minor build configuration changes.  Should work more smoothly with cmake find_packages now.