Updated Makefiles and .gitignore