Updated copyright to some files, updated Ant scripts to run Mapping and Utility tests, did some clean up and wrote more Mapping tests