I only aerate before pitching. And in the Starter (well, I haven't here, but my next batch will).
Good article on aerating the Starter: http://maltosefalcons.com/tech/MB_Raines_Guide_to_Yeast_Culturing.php
Someone else posted this recently... not my find.