Making some minor code changes and pom updates to support hadoop2 + mr1.