tests pass
scripts and library code
address pep8 comments
dealing with test errors
dealing with merge conflicts
Merge branch 'master' of https://github.com/qiime/qiime into testremove
closing fd
dealing with merge conflicts
change varriable name
change varriable name
adding one
clean up test_parse.py
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
adressing comments
fix test failure
Merge branch 'master' of https://github.com/qiime/qiime into change_tofd