refactor to better support chained interpolation
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/interpol-debug.js
fixup