Basic tags support
Add timeouts to mongo connection/socketio
Merge branch 'master' into f/tags

Conflicts:
	djabe/utils.py