Update osx build scripts
Merge branch 'master' of https://github.com/spesmilo/electrum
Merge branch 'master' of https://github.com/spesmilo/electrum
Make windows build scripts work for Electrum 1.7