Add deep_merge to the Gemfile(.lock) and vendor it

This fixes #560.