Update to elasticsearch master
Move tests to elasticsearch test framework

Related to #17
(cherry picked from commit 89ed30a)