Fix #168, Fix #1506
fixing errors
erge branch 'master' of https://github.com/biocore/qiime into remote

updating to more recent version of qiime
pulling latests version and fixing small error
Merge branch 'master' of https://github.com/biocore/qiime into add-swarm

merge latest changes from upstream master
added swarm
code review modifications + change of using 'uclust_otu_prefix_id' to 'denovo_otu_prefix_id' & all de novo tools
MAINT: updated imports from skbio app controller to import from burrito, fixes #1644
REL: added note to change log
Merge pull request #1645 from gregcaporaso/issue-1644

updated to use burrito instead of skbio.app
Merge pull request #1643 from ekopylova/add-swarm

Add swarm to pick_otus.py
issue 1646 resolved
Merge pull request #1647 from ekopylova/issue-1646

issue 1646 resolved Thanks @ekopylova
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