Changed timeout from 120 to 240.

The parallel test was timing out for @ElDeveloper and I.
Merge pull request #704 from jrrideout/core_diversity_analyses_timeout

Changed timeout from 120 to 240 seconds.
updated one test to use new test data
updated several tests to use new test data
Merge branch 'master' into workflow-updates
expanded on updated tests to include tests of a few more values
removed test for presence of wf.test.otu.CleanUp.ReferenceOTU0

because the subsampling is random, we occasionally don't have any "clean-up" OTUs. this test was failing too frequently for it to be useful (and running it multiple times to check for presence in a subset of the results wouldn't work well here because ofthe long run time of the test).
update test_pick_subsampled_open_reference_otus_no_prefilter to use new test data
updated test_pick_subsampled_open_reference_otus_suppress_step4 to use new test data
removed test_pick_subsampled_open_reference_otus_parallel_suppress_step4

this was fairly redundant, and trying to reduce runtime without affecting the test coverage too much
modified layout of tests
added metadata and seqs for two additional samples

this is useful for testing iterative_pick_subsampled_open_reference_otus
fixed some errors from the previous commit
some additional tests updated to use new test data
edits to complete port to new test data

- all tests now use new test data
- fixed infrequent failure in test_pick_subsampled_open_reference_otus_suppress_step4
- removed test data that is no longer being used
fixed bad reference in test