remove unnecessary db.table(id) constructs
fix merge problems
Cleanup and a couple of missed cases
fixed a couple of problems in a side-by-side comparision, also fixed issue 41 (one character change)
Merge pull request #42 from OpenTreeOfLife/issue38

Issue38