added line numbers mode and turned on subword mode in cc-mode hook
merge from remote