Merge pull request #63 from elzaggo/develop

Added output_magic to private_encoding
Selected 2.5.2 and 2.6.0 hadoop versions
Added symlinks for the libhdfs versions 2.5.2 and 2.6.0
Added symlinks for the hadoop 2.5.2/2.6.0 configuration
Support hadoop 2.5.2/2.6.0 in the Travis hadoop installer
script: changed args.combiner_fn to args.combine_fn
Added Hadoop version 2.5.2 and 2.6.0 to the Travis configuration file
Merge branch 'lastest_hadoop_versions_support' into develop
app: fixed opt mirroring
Merge pull request #65 from simleo/fix_script_params

pydoop script: fix combine_fn arg
Merge pull request #67 from kikkomep/develop

Added support for Hadoop 2.5.2 and 2.6.0
Merge remote-tracking branch 'upstream/develop' into input_format_mrv2
updated README.md
added links
Merge pull request #68 from simleo/update_readme

Update readme
Merge remote-tracking branch 'upstream/develop' into input_format_mrv2