minor syntax changes
minor restructuring to reduce code duplication
Merge branch 'master' of ssh://github.com/OpenTreeOfLife/taxomachine
var declaration fixed. Oops