Merge pull request #165 from elasticsearch/2.x

Merge changes from 2.x test branch to master.
Merge pull request #166 from untergeek/2.x

This turned out to not be needed.
Fixes #167

Updated changelog with fix info

closes #167
Pre-release 2.0.0 cleanup

Fixes #167

Updated changelog with fix info

closes #167
Merge remote-tracking branch 'upstream/2.x' into 2.x

Conflicts:
	Changelog.rst