the year i did no poo with BS and ACV i used coconut oil as a leave-in condition and that worked very nicely. you can also use it as a deep conditioner, leaving it in over night and then washing it out. that leaves hair soooo silky. if coconut oil is too heavy for your hair, Jojoba Oil works really nicely too.
right now i cleanse with Dr. Bronner's baby/mild soap (diluted). for conditioner i am using (and *loving*) the Honey Hemp conditioner from Oyin Handmade. and also the Greg Juice from Oyin too (which is a really light, detangling leave-in) i strongly prefer buying from a small, independently owned company whenever possible.
oh, and i've heard good things about the new conditioning rinse from Dr. Bronner's (which Frontier is now carrying, btw). i've been considering picking some up.