Use options.type property for handling HTML, JS, AMD, and CommonJS output types
Add CommonJS to Jade task, complete with tests
Merge branch 'patch-2' into patch-1

Conflicts:
	tasks/jade.js