changes to grpah mapper to relfect renaming and a bug in add_subedge
changes to graph_mapper extra that i missed
Merge branch 'master' into neaten-graph-mapper

Conflicts:
	pacman/model/graph_mapper/graph_mapper.py