Automatic conflict resolution for vanilla content

[bcssov]

1. Load vanilla content along side mod content (perhaps use indexing?)
2. Use the vanilla defs as the common ancestor to handle automatic merge resolution by creating patches using google-match-patch