Updated whitespace settings and git history stuff