Support option strings for combo fields

For #1259 and #1709
Now combo fields can support a strings object instead of just displaying the keys.  This allows for friendlier (and translatable!) values.

I did not add strings for every preset with a combo field, but I did convert many of the most useful ones in 98119b5.

![screenshot 2014-07-21 16 29 36](https://cloud.githubusercontent.com/assets/38784/3649880/9f41e842-1116-11e4-916d-0b237f27ab49.png)
![screenshot 2014-07-21 16 29 18](https://cloud.githubusercontent.com/assets/38784/3649883/a1249b82-1116-11e4-8f4e-bf3956ae1b14.png)

This line makes me unsure about this feature as a whole, because it limits the inputs for e.g. "Religion" to what's been predefined, which is by unlikely to ever be complete. Anyone who needed to input a different religion would have to use the raw tags editor.

Are you thinking that we only use options strings in cases where the set of valid values is 100% known and fixed?