Updated to support hive .13 and hadoop 2