fixes to Makefile and updates to gitignore