Removed non-free kochi-substitute and added kochi from Debian package.
Moved kochi-mincho and kochi-gothic back into one package.
Re-added the non-free kochi-substitute with naga10 glyphs.
Merge branch 'kochi-substitute' of github.com:/auntieNeo/nixpkgs into kochi-substitute

Conflicts:
	pkgs/data/fonts/kochi-substitute/default.nix