Merge pull request #280 from shaitan/recovery

Recovery: Rewrote deep_merge.
v2.24.14.30
Merge branch 'master' of github.com:reverbrain/elliptics into recovery