jsonned harmony
Merge branch 'master' of github.com:bmcfee/nonstandards

Conflicts:
	web/nonstandards.py