changed extensions for vim hightlighting, moved utility functions