Fix makefile and update .gitignore