copy in some m4 macros, delete gitignored stuff