use bundle to tell nokogiri to build libraries rather than an environment variable
fixed model image tests for unpredictable image size after resizing (dependent on imagemagic library version it seems)
reverted guide to use earlier mechanism of installing NOKOGIRI for 14.04 and mint, since the bundle way only seems to work with nokogiri >= 1.6.2 (thanks to Martin Eberhardt for bringing this to our attention)
merged
backed out change to nokogiri install, works using bundle mechanism for later versions of nokogiri
rebuilt docs
added acts_as_trashable to acts_as_asset to cover all asset types
fixed the styling of the system message on the signup page
removed white_list_formatted content gem
Backed out changeset 307f9f891b7d
format_attribtue is used in some of the forum stuff. Will need to update these first
another attempt at removing white_list_formatted_content
try removing the gibberish gem
removed the use of gibberish in the forum index
update tags
Merge latest from 0.21 mercurial

Conflicts:
	.hgtags
removed more gibberish, and updated forum tests to latest to give greater coverage
update tags
Merge fix from 0.21 mercurial

Conflicts:
	.hgtags
ignore .orig files
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