Fixed references to jrnl_conf
Updated docs from master
Fix copyright