Added composer target to build.xml. Fixed phpdoc generation
Add thrift.port to elasticsearch config in travis script
Refactored travis run_elasticsearch.sh. Every ES node uses its own config now
Merge branch 'master' into build-cleanup
Merge branch 'master' into build-cleanup
Fixed whitespaces in build.xml
Merge pull request #328 from munkie/build-cleanup

Build cleanup