Rebecca Hauck has a great article on Photoshop and CSS Shapes that explains what Adobe are working on when it comes to using Photoshop for creating shapes for the web.
She also explains how to wrap text around the shapes.
Have a look at her article here: