Cleaning up Makefile and .gitignore