Updated .gitignore and Makefile