Update to upstream version.
Merge branch 'develop' of https://github.com/darkwallet/darkwallet into develop