Remove reference to .relative_gitmodules from README.txt
Add instructions to use make -f Makefile to README.txt for GNU make.
Merge remote-tracking branch 'upstream/master'
Fix some comment errors
Fix witchspace entry error for assassins
Merge pull request #68 from kanthoney/master

Remove reference to .relative_gitmodules from README.txt
Always allow operators in string expansion

Checking a flag adds overhead, and there shouldn't be any syntax
conflicts with existing expansions.
Rename manifest-cargo-quantity-format

New string is not compatible with old one for expansion purposes
Use even disto when using good RNG to select desc variants
Fancify more string expansion variants
Clean up OOCharacter

Mostly style changes, and hiding of internal methods. Also removed
longDescription property; it was never used and the setup code was
broken.
Reform ship crew setup

Adds a convenience method for the common case, which two changes:
* It does nothing for unpiloted ships
* It uses the ship's nominal home system rather than the current
  system as the character's origin seed. I don't think this can
  make a difference currently, but it's future-proofing.
Unpilotedness reform

* Rename isUnpiloted to isExplicitlyUnpiloted
* Add more general isUnpiloted method covering things like rocks.
Merge remote branch 'origin/master' into fancy-expand

Conflicts:
	src/Core/OOStringExpander.h