Organize some invocations.
Merge branch 'master' into dart_explorer

Conflicts:
	lib/dart-tools.coffee