Add command line option to specify elasticsearch server
Merge branch 'elasticsearch'