Removed the makefile - no point if using Ant really
Fixed (I hope) the failing integration test