MAHOUT-1108: cleanup for running on Hadoop and locally

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