Fixing ci_type and metrics option type of conditional_uncovered_probability.py
Fixing test_alpha_diversity.py in test_pycogent_backports
Merge branch 'master' of github.com:qiime/qiime into conditional_uncovered_prob
Changing import from pycogent_backports.option_parsis to qiime.util
Merge branch 'master' of github.com:qiime/qiime into conditional_uncovered_prob
Merge branch 'master' of github.com:qiime/qiime into conditional_uncovered_prob
Merge branch 'master' of github.com:qiime/qiime into conditional_uncovered_prob
Changing metrics_list to metrics
Merge pull request #821 from josenavas/conditional_uncovered_prob

Fixing ci_type and metrics option type of...
Merge branch 'master' of git://github.com/qiime/qiime into issue_779