adding new functionality, should be ready for all but need to test meta-analysis
Merge branch 'master' of https://github.com/biocore/qiita into issue_487
removing print
addressing @wasade and @adamrp comments
Merge branch 'master' of https://github.com/biocore/qiita into issue_487
Merge branch 'master' of https://github.com/biocore/qiita into issue_487
fixing issues created from upstream master
fixing more issues
adding a print to see why it is failing
adding uploads to setup.py
specify file vs. folder
fixing final issues and changing name of main function
Merge pull request #584 from antgonza/issue_487

BLOCKER: Issue 487