Merge pull request #297 from kelseyq/dont_model_options

Don't model options
Capitalize the Date return
Merge branch '2.2.x_2.9' into 2.2.x_2.10