Merge branch '280' of https://github.com/erikvold/collusion into erikvold-280
fix some issues with the sidebar and following blocked sites through the list view
Merge branch 'erikvold-280'