Small logic fixes and import fixes for validate path
Small logic fixes and import fixes for validate path

CenterForOpenScience/waterbutler,RCOSDP/waterbutler,chrisseto/waterbutler,Johnetordoff/waterbutler,TomBaxter/waterbutler,felliott/waterbutler,kwierman/waterbutler,hmoco/waterbutler,rdhyee/waterbutler,cosenal/waterbutler,icereval/waterbutler,rafaeldelucena/waterbutler,Ghalko/waterbutler