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