Set next-line-add-newlines
Disable electric return in c++-mode
Add some more cc-mode "cleanups"