Fixed Issue with BBcodes not Rending

Only the elements bb code was implemented...
Remove all block related markup to avoid duplication

Closes #404
Closes GH-167
Merge branch '1.5-duplicate-container'
Merge remote-tracking branch 'upstream/master' into php-codesniffer-fixes