Revert 447a430..6f3c8cd

This rolls back to commit 447a430b9151ab7b6258bf06fd7615bae7add814.
Reverted back, merge failed to build under rstan

Also cleaned up make/os_mac