Refactor in preparation for pretty-print comb
Merge branch 'master' of https://github.com/jhp/canvas-graphics

Conflicts:
	coroutine.js