Update makefile
Add .gitignore
Update group_by statement