Merge pull request #2 from jbunting/feature/organize-hadoop-deps

Organize hadoop dependencies
Merge branch 'master' into feature/first-unit-tests