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
Merge branch 'master' into seek-unstable

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

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