Resync'd some line endings with DarkStar, which only changed because someone or someones text editor was converting them (Don't do that.) Hopefully you see fewer instances of git insisting there is an edit conflict when the only change was line ending type now...