First stab at using a new locking mechanism.
Python 3 compatibility for lockfile.py.
Merge pull request #55 from ui/new-locking

New locking