Merge pull request #121 from annando/master

pump.io - connector and some issue with the API and statusnet
Merge remote-tracking branch 'upstream/master'