Hadoop version bump to 2.5.0
Adjustments to match changes in Biohadoop