Removing unused imports
Changing Trie functionality from cogent to skbio
Merge branch 'master' of git://github.com/qiime/qiime into trie
Removing pycogent_backports/usearch.py
Solving merge conflicts
Fixing @wasade's comments
Fixing merge conflicts
Merge pull request #1435 from josenavas/trie

Port the use of the Trie object from cogent to skbio
Remove qiime.parse.filter_otus_by_lineage

This function wasn't being used anywhere in QIIME. Noticed this while updating QIIME to use skbio's subsample functionality.
update alpha_diversity.py to use skbio's subsample
update qiime.rarefaction to use skbio's subsample
Merge branch 'master' into subsample

Conflicts:
	qiime/parse.py
	tests/test_rarefaction.py
Merge pull request #1461 from ElBrogrammer/subsample

Update to use skbio's subsample
fix test failure
Merge branch 'master' of https://github.com/qiime/qiime into change_tofd