added .DS_Store to gitignore for pushes from mac
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/mahout
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/mahout
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/mahout
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/mahout
MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes apache/mahout#12
MAHOUT-1464 fixed bug counting only positive column elements, now counts all non-zero (pat) closes apache/mahout#18
MAHOUT-1581 - Increase timeouts to avoid false positives.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/mahout into MAHOUT-1365