Don't need the merges directory

Don't need the merges directory as phonegap will generate this. We do need the platforms directory otherwise the build fails. Removed the /merges/.gitignore and added /merges to top level .gitignore