Pull down off-canv branch.
Merge in obscenityfilters branch.
Fix some tests.
Pull from upstream.
Pull from upstream.
Merge from master.
Pull from upstream.
Fix more tests.
Merge pull request #120 from xdothackerx/tests

Tests