Tweaks to makefile and .gitignore