Properly make some Xom-related text in hints mode gender-neutral.
Fix a crash when a monster considers whether to pick up a weapon when not already wielding one.
Merge branch 'cl-trunk' into liars-day-2014

Conflicts:
	crawl-ref/source/hints.cc