Changed 'marshal' attribute to 'marshalling'.  Added the latter to the Vim syntax file.
Merged.