Merge tag 'v0.4.2' & upgrade coffee to 0.6.3

Conflicts:
	package.json