Merge the simplified logging back to the main line, and get rid of the tokudb.1493a branch. Closes #1493.

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