Clang fixes
Merge remote-tracking branch 'origin/swged' into swged

Conflicts:
	src/swganh/tre/iff/iff.cc
Clang fixes