re-enabled locking code, this still passes account_pthread.c
started rewriting the ~~lock() and ~~unlock() functions to match the examples in storm's lock.h.  Need to refine this.