Merge branch 'master' into 2.3
added additional note about makelogs
version 2.3.0
updated branch ids on the badges in the readme, and testing against the latest 1.2 release
Adding esq as an alternative to elastic.js
Merge branch 'pr/124'