Reverting stanza_router to non-conflicted version

Making the best attempt out of a bad merge from waqas

Added TODO

Merged from Matthew

Merged from Matthew

Removed .hgtags

Fixed: Works when LuaRocks is not present

Roster updates

Docs update

Presence fixes

(0) -100 -10 +10 +100 +300 +1000 +3000 tip

mercurial