Clean up code
Bump version to 2.1.0
Don't default :searchable when a different :index_as is specified
Update history
Refactor clearing the mappings