add a locking client
Merge remote-tracking branch 'origin/master' into add_locking_client
pass options through to the locker
fix require
Merge pull request #30 from estately/add_locking_client

Review: add a locking client