Merge branch 'master' of github.com:reverbrain/elliptics into recovery

Conflicts:
	bindings/python/elliptics_id.cpp
	bindings/python/elliptics_id.h
	recovery/elliptics_recovery/iterator.py