Updated to use individual m4 files from upstream repo, and many other cleanups