Fix #35: Prefer HADOOP_HOME env var to find hadoop conf file
Merge branch 'develop' into feature/hadoophome
Merge branch 'feature/hadoophome' into develop