Fix self merge
Merge pull request #600 from twitter/merge-fix

Fix self merge
Fixup build file
Remove withCross
Merge pull request #601 from twitter/clean-jackson-dep

Fixup build file
Use a uuid in path to deal with hadoop tests
Adds groupRandomly and shard to TypedPipe
Improves JobTest code
Whitespace-only cleanup to Matrix2
Addressing some Matrix2 TODOs
Memoize for correctness
Merge pull request #605 from twitter/matrix2cleanup

Whitespace-only cleanup to Matrix2
Merge pull request #603 from twitter/groupRandomly

Adds groupRandomly and shard to TypedPipe
Merge pull request #606 from twitter/somematrix2todos

Address some of the Matrix2 TODOs
Merge pull request #602 from twitter/clean-jackson-dep

Use a uuid in path to deal with hadoop tests
Try to run with random name to deal with Hadoop race
Try again
Merge pull request #612 from twitter/random-user

Try to run with random name to deal with Hadoop race
Merge branch 'develop' of github.com:twitter/scalding into jobtestcase
Merge pull request #604 from twitter/jobtestcase

Improves JobTest code