Fixes #185 reindex considers mapping types

Conflicts:
	src/main/scala/com/sksamuel/elastic4s/Client.scala