convert to 2 spaces, cap comments at 80 chars
Fix merge conflicts with changing to 2 space spacing and 80 character lines. Also, undo #10 - we need to have a discussion about this one, becuase we have differing opinions on it.
Merge branch 'jenius-spacing-comments'