(No conflicts had to be manually resolved) Gave weight paint a basic ability to draw edges and vertices with an option (with colors for selected/unselected), but I didn't make any vertex selection functions available in weight paint mode yet (tested with edit mode for now).