Fixed OS X steps to use Homebrew commands (was using MacPorts commands)
Converted print statement in class_sqlThread to logger calls
Merging with master and resolving conflicts
Resolving upstream conflicts
Merge branch 'master' of https://github.com/DivineOmega/PyBitmessage into class_sqlThread_logger
Add backend ability to understand shorter addresses.
Introduces addresses version 4.
Made changes suggested by nimdahk
Allow backend to send and receive version 4 addresses
Updated several missed references to version 3 addresses
Responded to comment from jvz; fixed brew install instructions.
Merge pull request #441 from Atheros1/master

refactored helper_startup.py so that it can make use of a pre-set shared.appdata variable
Merge pull request #393 from erikackermann/patch-1

Fixed OS X steps to use Homebrew commands (was using MacPorts commands)
Merge pull request #394 from DivineOmega/class_sqlThread_logger

class_sqlThread.py - changing prints to loggers
Merge pull request #442 from Atheros1/master

manually undid much of pull #287. Discussion in #398
Merge pull request #446 from Atheros1/master

Convert 'API Error' to raise APIError()
undid support for receiving v4 addresses until more chanages are implemented
Merge branch 'master' of github.com:Atheros1/PyBitmessage