Merge pull request #73 from hazendaz/master

I agree that these controls help with code consistency. ?w=1 is my Github best friend when looking at diffs to mask out the unnecessary whitespace changes. 

Add suggested git attributes. Also reformat a few egregious offenders.