Addresses #337
Makefile modifications, test modifications,
Lock tree is better integraded with db.

git-svn-id: file:///svn/tokudb@2126 c7de825b-a66e-492c-adef-691d508d4ae1