Clean up init logic and add some helper functions
Clean up init logic and add some helper functions

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