prep for v0.5.18 release
Merge branch 'develop' of ssh://github.com/jim618/multibit into develop