Merge pull request #3 from makingwaves/div-bug-fixes

Div bug fixes
Added a couple more default context excludes
Merge remote-tracking branch 'origin/master'
Fixes form inside form problem, and html entities in strings