Commit corresponding to OTT 2.0
A working OTT 2.1, a few more changes yet to be done
Smasher version corresponding to OTT 2.1 - edit system, etc
Merging non-OTT changes into OTT branch
Merge pull request #61 from OpenTreeOfLife/ott21

Ott21