Added test for lock/unlock
Removed timeout
Merge remote-tracking branch 'upstream/master'
start_key -> startkey

For consistency (:
Missed a few timeouts
Merge pull request #30 from wcummings/master

start_key -> startkey