pom cleanup
Merge remote-tracking branch 'origin/master'
using mapred.input.dir if bucket name is not set
using mapred.input.dir if bucket name is not set (fixes)
Merge branch 'master' into hadoop2