Update P and BR stripping code to play nicer
Update P and BR stripping code to play nicer

filipstefansson/bootstrap-3-shortcodes,MWDelaney/bootstrap-3-shortcodes,filipstefansson/bootstrap-3-shortcodes,MWDelaney/bootstrap-3-shortcodes,MWDelaney/bootstrap-3-shortcodes