exposing elasticsearch exceptions
fixed conflict in changes.txt
Merge pull request #526 from Topface/es-exceptions

Exposing elasticsearch exceptions