Nested shortcodes fix

Shortcode application is a one-shot thing, so if you expect short codes
inside of short codes, you've got to add do_shortcode().