OS X build fixes: bringing in i2psam fixes from makefile.unix
Merge remote-tracking branch 'origin/master-neo' into master-neo