Improve diff output of numeric keys and add tests for split diffs
Merge branch 'master' into geezer

Conflicts:
	lib/util.js