#686: .gitmodules, ignore 'jsonmerge' submodule
#686: .gitmodules, adjust spacing
#686: .gitmodules, fix typo for 'jsonmerge' ignore
Merge pull request #688 from jeff1evesque/gitmodules

#686: Add 'ignore=dirty' for 'jsonmerge' in '.gitmodules'