Fix #168, Fix #1506
fixing errors
pulling latests version and fixing small error
resolves issue #1649

adds documentation to what file format is acceptable for the script when using t
he --sample_id_fp option.

cleans up the lines of code that do the filtration when that option is passed.
add swarm as denovo picker
tests
Fixing qiime/rarefaction.py
Fixing qiime/split.py
Merge pull request #1652 from josenavas/biom21

Biom21
Typos
API/ENH: QIIME now depends on BIOM 2.1

QIIME should now depend on BIOM 2.1 and not in BIOM 2.0.1-dev, a note
has been added to the ChangeLog.md file.

Fixes #1590
Merge pull request #1654 from ElDeveloper/biom-2.1

API/ENH: QIIME now depends on BIOM 2.1
Merge pull request #1650 from wdwvt1/issue_1649

resolves issue #1649
Documentation update

Fixed link in the alpha_diversity.py script to point to correct page.
[skip ci]
Merge pull request #1659 from wdwvt1/docu_update

Documentation update
Merge pull request #1651 from ekopylova/add-swarm-denovo

Add swarm de novo
Merge pull request #1653 from frederic-mahe/patch-3

Typos
Merge pull request #1513 from antgonza/fix_168_1506

Fix #168, Fix #1506
BUG: Remove extra <tab> character in alpha's HTML

The make_rarefaction_plots.py had an extra <tab> character in between
some of the javascript code that's used to display the plots.

Fixes #1483
merge resolved