Fix Makefile and update .gitignore