Now requires minimum version of R instead of exact match, see issue #624
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
Merge branch 'master' of github.com:qiime/qiime
Fixes issue #798
RExecutor tests now respect qiime temp dir.
Alternative hypothesis is now explicitly stated.

Alternative hypothesis is now stated in the output stats file. Affects make_distance_boxplots.py and make_distance_comparison_plots.py. Also updated script usage example output.

Verified this using the overview tutorial dataset, as well as with smaller examples in R and using PyCogent's t_two_sample.

Fixes #657.
Merge branch 'master' of github.com:qiime/qiime into conditional_uncovered_prob
Changing metrics_list to metrics
Merge pull request #909 from jrrideout/r_tmp_dir_2

RExecutor tests now respect qiime temp dir.
Merge pull request #898 from danknights/master

Remove std dev reporting for LOO error estimates in supervised learning, fixes issue #798
Merge branch 'master' into issue-657

Conflicts:
	ChangeLog.md
Merge pull request #910 from jrrideout/issue-657

Alternative hypothesis is now explicitly stated.
fixes #764

I can't figure out how to split this string across multiple lines and do the replacement without joining the string with +, so just going with that here.
Merge pull request #821 from josenavas/conditional_uncovered_prob

Fixing ci_type and metrics option type of...