Added stuff for CDH4 and mrv1. Also updated ant version.