Fix content escaping issue within pre blocks
Only replace &amp; in pre block, that was what was causing the problem in any case
Merge pull request #270 from dirkcuys/master

Fix content escaping issue within pre blocks
Merge pull request #271 from p2pu/master

Fix content problem