fixing doc
Merge branch 'master' of github.com:biocore/qiita into fixing_doc_from_333
Merge branch 'master' of github.com:biocore/qiita into fixing_doc_from_333
fixing all flake8 errors and changing travis to use flake8 vs. pep8
Merge pull request #365 from antgonza/fixing_doc_from_333

fixing doc