Fix OSX / Windows builds
Merge branch 'master' of ssh://github.com/spesmilo/electrum