Fix diff output and set timeout to 2sec
Require 2 timestamp directories to run 'rake diff'