various fixes to allow mac osx compilation
mac osx building fixes
Merge branch 'master' of github.com:monero-project/bitmonero