Update instructions to add OS X and account for fancy Makefile
Merge pull request #1 from gwillen/master

Update instructions to add OS X and account for fancy Makefile