Update .travis.yml to elasticsearch 1.3.2
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
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