local locking and better remote locking
don't lock in tests
improve dirty pull behaviour
encfs wrapper script