Fix Makefile and .gitignore