Update .gitignore
Merge several Makefile.am to make build system a bit more stable