Require expire to touch lock when expire has been set
remove unnecessary instance attribute
Merge pull request #3 from dreadpirate15/master

Fix expire timestamp getting out of control for long running locks