Merge pull request #387 from OpenTreeOfLife/master

Fixing order of NexSON-loading operations
Merge pull request #388 from OpenTreeOfLife/master

Re-order NexSON-loading and tree normalization
Fix broken OTU mapping (pair of typos in new TNRS)
Merge pull request #393 from OpenTreeOfLife/master

Fix broken OTU mapping (pair of typos in new TNRS)
Improve error reporting for failed DOI lookups.

Fixes #389.
Load current search-context list for OTU Mapping.

Also adding visible errors if this list fails to build in either webapp.
This addresses #396, but I'm leaving the issue open as we discuss
presentation options like a nested list.
Merge pull request #397 from OpenTreeOfLife/master

"Push-worthy" improvements for Cavia
Basic implementation of all study-export options.

Fixes the bug in #400, but doesn't explain ambiguous OTU labels.
typo
Add a popup explaining all study download formats.

Fixes #400.
Revise waiver+license options for new studies.

This also includes some text cleanup. Partial fix for #369.
Fix SELECT values vs. display strings.
Display applied waiver/license; offer CC0 anytime.

Fixes #369. As requested, the UI can only apply the CC0 waiver to a
study that has no waiver or license already. This is a "ratchet", and
CC0 can't be revoked here after it's been applied. (The only way out is
to cancel or close the curation session without saving changes, or to
modify the NexSON in the docstore.
Merge pull request #401 from OpenTreeOfLife/master

Fixes for study-download options and waiver/license UI. This has been tested on devtree and devapi.
Show unique names in search menu (vs. mouseover)
Removing old config.local (should not be here)

This file was also outdated and very incomplete. Better to copy and customize the `config.example` file.
Add UI for fixing ambiguous internal-node labels

I would have preferred this as a branch, but I had unresolved conflicts
in the workspace. :-/
Merge branch 'master' of github.com:OpenTreeOfLife/opentree
More complete UI for settings internal node labels

Fixes #349, unless I hear differently in user testing.
Minor bug fixes (missing tree label, missing edge)