Merge pull request #1213 from silverstripe-rebelalliance/feature/shortcodes

FIX issues with new shortcode parser
FIX ShortcodeParser producing bad output after escaped tag

Also tightens up matching of shortcodes so we dont match on invalid shortcodes