Update to OT, CM and the CM update script.
Accomodate the change from anaran.
Reinstate root's metadata.
Merge branch 'master' of github.com:anaran/plugs

Conflicts:
	lib/css/ui.css