clang format;  also fixed clang-format.sh for usage on macs