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
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 branch 'master' into issue-657

Conflicts:
	ChangeLog.md
Adding new option 'blast_db' and fixing parallel_blast.py
Merge pull request #910 from jrrideout/issue-657

Alternative hypothesis is now explicitly stated.
Fixing typo
Added comment about parallel_blast.py interface change on ChangeLog.md
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...
Merge pull request #915 from gregcaporaso/issue-764

fixes #764
Merge QIIME master
Fixing merge conflict on ChangeLog.md
Merge pull request #912 from josenavas/blast_db_option

Adding new option 'blast_db' and fixing parallel_blast.py