Improved CPP vim syntax file