merge the .gitignore and cygwin compatibility