Make sure we delete the temporary file for a lock file

In cases of contention, we would leave the temporary file lying around.
Add a -d option to admin.py to delete groups