Updated the .gitIgnore

This should ease merging problems.