Update instructions to add OS X and account for fancy Makefile