Add coffee to dependencies and chai to dev dependencies.
Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json