Fix Makefile and gitignore