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

updating to more recent version of qiime
sortmerna + sumaclust added to the open refernce OTU picking pipeline
Fixing documentation
Merge branch 'master' of git://github.com/qiime/qiime into new-software-otu-picking
Solving PEP8 issues on the test file
Adding tests for sortmerna+sumaclust
pulling latests version and fixing small error
Fixing merge conflicts
ENH: update to remove cogent dependency, fixes #1552
first pass as porting to use skbio's majority_rule
ENH: updated scikit-bio dependency version
Merge branch 'issue-1552' into issue-1551
Merge pull request #1618 from gregcaporaso/issue-1552

remove cogent neighbor joining dependency in favor of skbio
Merge pull request #1619 from gregcaporaso/issue-1551

porting to use skbio's majority_rule
Merge pull request #1 from josenavas/new-software-otu-picking

Tests for new open ref workflow
added suma
Merge branch 'new-software-otu-picking' of https://github.com/ekopylova/qiime into new-software-otu-picking

pulled API updates
tests finished for pick_open_reference_otus using sortmerna and sumaclust, sortmerna_otu_id_prefix option removed - now reference sequence ID is the OTU id to be consistent with other methods