Update 7

Major clean up for build.phonegap