FYI for the line-endings, since you're on Mac it may be helpful if you set:

$ git config --global core.autocrlf input

I'm on Windows so I have 'core.autocrlf true'.  See here for details, but that should make things work for us all:

http://git-scm.com/book/ch7-1.html#Formatting-and-Whitespace