Increasing some timeouts in split_diff from 30s to 60s.
Merge pull request #239 from youtube/increase_split_diff_to

Increasing some timeouts in split_diff from 30s to 60s