Remove unused attributes/methods
Add MERGE to the experimental parser
Upgrade Scala to version 2.10.1 and Scalatest to version 2.0.M6-SNAP20
Code style