Fix NPEs in blocking code
Merge pull request #802 from SamWhited/blockingfix

Fix NPEs in blocking code
Simplify roster handling code

Merge result handling code into IqParser

Fixes #20