#683: Submodule, add 'jsonmerge'
Merge pull request #684 from jeff1evesque/submodule_jsonmerge

#683: Submodule, add 'jsonmerge'
Merge branch 'master' into python_svm_training
#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'
#687: .gitmodules, ignore 'scikit-learn' submodule
#687: .gitmodules, adjust spacing
Merge pull request #689 from jeff1evesque/gitmodules

#687: Add 'ignore=dirty' for 'scikit-learn' in '.gitmodules'
Merge branch 'master' into python_svm_training
#675: svm_training.py, implement json 'merge()' method