some changes
Merge branch 'trunk' of https://github.com/Coolblue-BI/mahout into trunk