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

This problem was introduced in 1a6e20d3
Merge pull request #21 from ucb-sts/timeout_fix

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