Renamed DataVertex to LabelledVertex
Merge branch 'master' into newEdge