Allow organism and subtypes to be optional.
Merge branch 'master' into gh-pages