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