FIX ShortcodeParser producing bad output after escaped tag

Also tightens up matching of shortcodes so we dont match on invalid shortcodes
FIX Make ShortcodeParser obey error_behavior in attribute scope
Merge pull request #1224 from silverstripe-rebelalliance/feature/shortcodes

Two more small fixes for new Shortcode Parser