Fixing option types for jackknifed_beta_diversity.py
Fixing --sort_by option type of pick_rep_set.py
Fixing --dir-prefix option type of split_libraries.py
Fixing --truncate_option option type for truncate_reverse_primer.py
fixed script test failure
Merge pull request #826 from gregcaporaso/issue-813

fixed supervised_learning.py script test failure
Upped timeouts of some workflow tests.

In an effort to use smaller Jenkins EC2 instances (e.g. m1.large), we've been seeing some tests timing out. These new timeouts seem to clear up the issue.
Merge pull request #828 from jrrideout/timeouts

Upped timeouts of some workflow tests.
updated to address #831
Merge pull request #819 from josenavas/truncate_reverse_primer

Fixing --truncate_option option type for truncate_reverse_primer.py
Merge pull request #818 from josenavas/split_libraries

Fixing --dir-prefix option type of split_libraries.py
Merge pull request #816 from josenavas/pick_rep_set

Fixing --sort_by option type of pick_rep_set.py
Merge pull request #814 from josenavas/jackknifed_beta_diversity

Fixing option types for jackknifed_beta_diversity.py
Merge pull request #832 from gregcaporaso/issue-831

updated to address #831
Merge branch 'master' of github.com:qiime/qiime into make_3d_plots
Changing import from pycogent_backports.option_parsing to import from qiime.util