Pulled ant build system back into dev