Code janitor with an added mention of form.json
Merge branch 'master' of https://github.com/eousphoros/rq

Conflicts:
	code/portaproc.rb