CloudI version 1.1.1 (beta) released
Merge branch 'develop'
release version 1.2.0 (beta)
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
first pass at elasticsearch
Add license information for thrift/poolboy
Add license information for

 - erlasticsearch
 - poolboy
 - thrift
Merge branch 'develop' of github.com:dieswaytoofast/CloudI into develop
Merge branch 'develop'
Clean up responses from elasticsearch

 - Add separate pools for "regular" and "binary" responses
 - No json decoding on binary responses (external)
 - integrate w/ v1.3 of erlasticsearch
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'develop'
patch erlasticsearch to not forcibly expect ES
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	src/reltool.config.in
Merge branch 'develop' into mps-elasticsearch

Conflicts:
	src/reltool.config.in
Merge branch 'develop' of github.com:dieswaytoofast/CloudI into develop

Conflicts:
	src/reltool.config.in