.merlin updated; .ocamlinit added