Merge many branches for stabilizing the dev environment

Branches merged:
* cale/rake-bootstrap
* cale/singleton-watchers
* cale/standard-coffee-watch
* cale/xmodule-assets-fewer-deletions
* cale/xmodule-assets-incremental

Conflicts:
* rakelib/assets.rake