Merge branch 'master' of http://github.com/fuzzgun/PyBitmessage into fuzzgun-master
comment out old self.trayicon
Merge pull request #153 from Atheros1/master

comment out old self.trayicon