Hadoop 2
Merge pull request #12 from edwardcapriolo/hadoop2

Hadoop 2