Improve handling of presence conflict

Fixes issue #311

Depends on asmack as a submodule (pull the submodule request first).