refactor mapping, adding in more fields to elasticutils index