Fixes merge conflicts for #62

https://github.com/logankoester/grunt-phonegap/pull/62