Adding for documentation at rtfd.org
Merge pull request #164 from untergeek/2.x

Adding for documentation at rtfd.org
Merge pull request #165 from elasticsearch/2.x

Merge changes from 2.x test branch to master.