Reverting some confused commits
Attempting again to fix line endings