readded gibberish gem. Introducing too much risk to remove from this version - it can be removed in a later merged version that includes greater test coverage
backed out removal of white_list_formatted_content gem
backing out some of the changes related to gibberish removal
backing out some more of the changes related to gibberish removal
update tags
Merge from mercurial 0.21

Mostly backing out the changes to the forums whilst attempting to remove white_list_formatted_content and gibberish gems
It will be easier to redo this with the better test coverage we get from virtual liver changes.

Conflicts:
	.hgtags
Merge branch 'master' into seek-unstable
Merge branch 'seek-unstable' into vln-merge

Conflicts:
	app/views/forums/show.html.erb
	test/factories.rb