cleanup and fixes

git-svn-id: https://svn.apache.org/repos/asf/mahout/trunk@1459418 13f79535-47bb-0310-9956-ffa450edef68