Various changes to support WaterButlerPath
Various changes to support WaterButlerPath

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