remove some obsolete bits from project/Depend.scala
Merge remote-tracking branch 'origin/master' into core

Conflicts:
	project/Depend.scala
Undo mistaken changes in f03f899. Issue #320.
(cherry picked from commit d2764b657ab0b286ea2cfa7041ebb54cfca1b179)
Merge remote-tracking branch 'origin/core' into headless