Add more files to gitignore, recover Makefile.am