Merge branch 'master' of https://github.com/DentonGentry/afterquery

Conflicts:
	render.js
	t/trender.js