Merge pull request #114 from OpenTreeOfLife/pluginsv2

Pluginsv2
Merge pull request #117 from OpenTreeOfLife/pluginsv2

Pluginsv2
Merge pull request #118 from OpenTreeOfLife/pluginsv2

reformatting and code cleanup
Merge pull request #119 from OpenTreeOfLife/pluginsv2

add trailing semicolon in source trees
Merge pull request #120 from OpenTreeOfLife/pluginsv2

Pluginsv2
Merge pull request #129 from OpenTreeOfLife/pluginsv2

Pluginsv2
Merge branch 'master' of github.com:OpenTreeOfLife/treemachine into pluginsv2