Finished conversion to hadoop-2.2.0 (old code is now in mapreduce package, new is mapred)