Wrap do_shortcode tags in output buffering to prevent shortcodes that echo stuff instead of return from breaking things like in #190