Add surround module
Remove Automotic C and CPP flags
Add some commands from sensible.vim