Mac OS-X seems to keep malloc.h in malloc/malloc.h.  Put an #ifdef __APPLE__ around the include.
undef the system ALIGN macro in KeccakSponge since it conflicts.
Merge pull request #1 from rossbiro/master

Mac OS-X seems to keep malloc.h in malloc/malloc.h.