Update .travis.yml to elasticsearch 1.3.2
Accept an options array at Type::updateDocument()
Update to elasticsearch-1.4.2
Update to elasticsearch 1.3.4
Merge changes.txt conflicts
Release v1.3.4.0 added
Merge pull request #692 from ruflin/release-v1.3.4.0

Release v1.3.4.0 added
Added "accept an options array at Type::updateDocument()" to changes.txt
Accept an options array at Type::updateDocument()
Added "accept an options array at Type::updateDocument()" to changes.txt
Merge branch 'master' of https://github.com/rmruano/Elastica

Conflicts:
	changes.txt
Added test for updating documents with parameters to TypeTest. Added pull request id to changes.txt
#687 Remove exception catch in Type::getDocument()
#687 Improve exception handling in Type::getDocument()
changes.txt
Moved ResultSet creation to a static factory method
Merge pull request #690 from merk/customisable-result

Move ResultSet creation to the Client
Correct README dependency
changes.txt
changes.txt