Cleanup Makefile and .gitignore