upgrading to scikit-bio 0.2.1
Merge pull request #586 from antgonza/issue_585

upgrading to scikit-bio 0.2.1
Merge branch 'master' of https://github.com/biocore/qiita into issue_487
fixing issues created from upstream master