prod tweaks
Merge branch 'master' into inpageknotes

Conflicts:
	knotesy/templates/knotes/list.html
hilite not ready yet