Added the option to disable wpautop.