Whipped Shea butter or embrace the solid reliability of Shea butter blocks? These two contenders, each for a spot in your beauty routine