Re-order discarded.json for readability

Also splits the import-related into groups by import
Add KSJ2 tags to discard list

See http://lists.openstreetmap.org/pipermail/imports/2013-September/002133.html
Merge pull request #1794 from pnorman/ksj_discard

KSJ discard addition