Fix bug where mappings with index_options break mappings

This is a bit of a band-aid.  We should add index_options as an actual keyword argument and instance attribute (and anywhere else appropriate).  However given that the mapping attributes can change, we should keep **kwargs to prevent future breakage