Cleanup gitignore, adding back Makefile

Cleanup .gitignore
Add Makefile which should not have been ignored