Pull down off-canv branch.
Merge in obscenityfilters branch.
Fix some tests.
Merge pull request #114 from xdothackerx/off-canv

Off canv
Pull from upstream.
filter completed?
Merge branch 'master' of https://github.com/xdothackerx/zoobit into petFilter
Pull from upstream.
completed filter
Merge from master.
Pull from upstream.
Merge pull request #117 from xdothackerx/petFilter

Pet filter
Pull from upstream.
Fix more tests.
merging with tests branch
Merge pull request #120 from xdothackerx/tests

Tests
Merge from upstream.
Merge in off-canv branch.
Fix merge conflicts.
butttooonnnss