Fix compilation error: macro timeout already defined in util.clj

This problem was introduced in 1a6e20d3
Merge branch 'timeout_fix' of github.com:ucb-sts/jepsen