Correct some default faction values: these should be faction identifying numbers, not faction strings.
Merge branch 'factionweirdness' of https://github.com/ChrisKitching/fa into ChrisKitching-factionweirdness