Bug fixes for
https://github.com/phonegap/build/issues/7
https://github.com/phonegap/build/issues/109