Revert back to default git conflict style
SCSS,CSS vim whitespace settings
Updated syntastic