[backport] Backport/todo markers

@sschaef I had to backport your PR #407 because the Play2 plug-in uses some of the scanner classes, and it's convenient for us to be able to work on Play2 sources with the Scala IDE nightly. Do you see any risk?

Is anyone against this?