I think this correctly replaces pair_t with std::pair for the edge_t type
removed one of the map_t instances from yada.  There is a really ugly workaround in here... it's 100% correct, but ugly.
removed the other MAP_T