Add option 'format' to allow returning only city for rails form compat

The format option defaults to 'olson', to return fully-qualified olson time
zones, and currently supports one other value of 'city', that returns only
the component after the '/', for compatibility with rails form helpers.