Added new allow_script_urls option and removed script and style from the default elements list.
Fixed broken performance.html test.
Proposed fix for bug #6410
Merge pull request #255 from jashua212/bug_6410

Proposed fix for bug #6410
Fixed a few issues with the fix for #6410
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into teampage