Moved code to add the sockslisten config option to a spot where it will actually work properly
Merge branch 'master' of github.com:Atheros1/PyBitmessage