Use elasticjs instead of  to allow for configuring the client, closes #718
Merge remote branch 'upstream/master'