Changes and Makefile for OSX, add .gitignore, #define bug in util.h