- cleanup references to language packages - ChangeLog: - bug fixes - Editor -- added support for EditorConfig -- added VCS conflict markers to the types shown on the marker map