switch to guardianproject smack repo
update to new commits
delete cusomt cipher patch (now in smack repo)