C++ format + syntastic config
Merge remote-tracking branch 'origin'