Merge branch 'cale/xmodule-assets-incremental' into cale/stabilize-dev-env

Conflicts:
	rakelib/assets.rake
Merge branch 'cale/singleton-watchers' into cale/stabilize-dev-env
Merge branch 'cale/standard-coffee-watch' into cale/stabilize-dev-env

Conflicts:
	rakelib/assets.rake