with_lock takes timeout

signature changed and tests work
with_lock changes in cass.py