Add shortcode support
Initial impmentation of shortcodes.
Clean up shortcodes helper.
Merge shortcodes branch.