[slap] Catch KeyError in query (no privs dict)
Merge branch 'slap-presence' into production

Conflicts:
	slap.py