Move Mac-specific settings into Makefile.mac from Makefile.
Use ESTIMATORNICKNAME=lbfgs-l1c10F1n1p2 to match the other current settings.