Updated gitignore and Makefile