Modifications for documentaiton and defaults
Merge branch 'ocs_collab' of https://github.com/wdwvt1/qiime into ocs_collab