Editing .gitignore files and makefiles