cleaning up deprecation.

Conflicts:
	src/main/scala/Grunt.scala