Rationalised the config.xml file and cp_build_config rake tasks in the phonegap.rake file.
Merge branch 'master' of github.com:DiUS/TEDxStartSomething
Merge branch 'master' of github.com:DiUS/TEDxStartSomething