adding in default whitespace settings
Merge remote-tracking branch 'origin/master'
dunno how this got removed