fixes for client (no bitmessage address)
Merge branch 'master' of https://github.com/orisi/orisi