timing out locking
with_lock takes timeout

signature changed and tests work
with_lock changes in cass.py
Merge branch 'master' into timeout-locking

Conflicts:
	otter/models/cass.py
time out releasing lock also
Merge pull request #673 from rackerlabs/timeout-locking

Time out locking