Merge branch 'cale/standard-coffee-watch' into cale/stabilize-dev-env

Conflicts:
	rakelib/assets.rake