Another gitignore update ... sigh
merging conflicts