Undo all of Nick's changes, since they break everything and they don't use org.apache.logging.log4j, and instead use org.apache.commons.logging. Also fix Makefile, since the bozos at org.apache.commons.imaging uploaded a new version and apparently deleted the old one.