timeout/soft_timeout arguments now renamed to time_limit/soft_time_limit

Closes #1329