Cleanup

Same as https://github.com/OpenTreeOfLife/peyotl/pull/28, but to master. Merging...