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
Merge pull request #393 from OpenTreeOfLife/master

Fix broken OTU mapping (pair of typos in new TNRS)
Merge pull request #397 from OpenTreeOfLife/master

"Push-worthy" improvements for Cavia
Merge pull request #401 from OpenTreeOfLife/master

Fixes for study-download options and waiver/license UI. This has been tested on devtree and devapi.
Suppress all but exact matches in OTU mapping...

... since approximate matches create tons of work in some studies.
Use doApproximateMatching when bulk mapping OTUs

Setting this flag to false (supported in the latest taxomachine/master)
makes bulk mapping go much faster. I'm keeping the careful tests for
exact matches in the AJAX callback, for use in later single-taxon mapping.
Ignore is_perfect_match, use ONLY if single match.

This is a temporary measure to improve OTU mapping quality. In testing,
multiple results (which should force a user choice) seem to be rare.
Fix index page for files/ott, fix api host for D3 tree views
Merge branch 'Cavia'

Conflicts:
	curator/static/js/study-editor.js
Merge branch 'master' into ott-index-page

Conflicts:
	deploy/files.opentreeoflife.org/other/synth_viz_dyn.html
	deploy/files.opentreeoflife.org/other/taxa_viz_dyn.html
Merge branch 'ott-index-page'

Fix index pages and API host for D3 tree views.