MAHOUT-1361: Updated with latest changes from Ted's git repo.

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