Improved .gitignore and Makefile