More config.xml cleanup
Makefile cleanup
More Makefile cleanup
Makefile for phonegap commit