Mac Compatibility
Merge branch 'mac' of github.com:Novators/EnScrypt into mac

Conflicts:
	scrypt/scrypt-jane-mix_salsa-xop.h
	scrypt/scrypt-jane-portable-x86.h
Mac Compatibility