Makefile: update for CLI building on OSX. Min OSX version is now 10.6 to avoid compiler errors with recent improvement to sync_cout
Merge branch 'master' into phash