Scala 2.10.0 ready
Merge pull request #33 from philcali/master

Scala 2.10.0 changes

Some tests are commented out due to attribute order from tidy'd output.