touchups and master branch on osx
touchups and master branch on osx

ethereum/ethereum-buildbot,chfast/ethereum-buildbot,chfast/ethereum-buildbot,ethereum/ethereum-buildbot,vaporry/ethereum-buildbot,vaporry/ethereum-buildbot,vaporry/ethereum-buildbot,chfast/ethereum-buildbot,ethereum/ethereum-buildbot