Adding support for aliases and compiling against CDH4 / Hadoop 2.0