merging in jimallmans changes from study-import-options branch of api
merging in jimallmans changes from study-import-options branch of api

mtholder/peyotl,OpenTreeOfLife/peyotl,rvosa/peyotl,rvosa/peyotl,OpenTreeOfLife/peyotl,mtholder/peyotl