Model the behavior of the output similar to the utility, by combining the same hops

Re-order to map round-trips to duplicates. Update the tests to validate the behavior.

Read this for display information: [Details on raw mode](https://bugs.launchpad.net/mtr/+bug/928509/comments/3)

14 (1-14) hops in the utility that people use vs 17 (0-16) in the raw of the same traceroute.

![image](https://f.cloud.github.com/assets/46037/652690/6f2c014c-d4b8-11e2-82bd-ff1dad3c4ccc.png)

VS

```
h 0 180.150.149.66
p 0 2301
h 1 120.136.47.144
p 1 290
h 2 120.136.47.11
p 2 878
h 4 180.87.180.37
p 4 51112
h 5 180.87.180.17
p 5 168413
h 6 66.198.127.1
p 6 168524
h 7 66.198.127.94
p 7 155338
h 9 65.116.208.122
p 9 204960
h 10 184.106.126.136
p 10 205747
h 11 50.56.6.129
p 11 208407
h 12 50.56.6.111
p 12 205191
h 13 198.61.169.94
p 13 211326
h 14 198.61.169.94
d 14 journal.paul.querna.org
p 14 210493
p 0 389
h 15 198.61.169.94
d 15 journal.paul.querna.org
p 15 210621
d 1 core1a-aggrit1.hkg1.rackspace.net
p 1 300
d 2 vl901.edge3.hkg1.rackspace.net
p 2 829
h 16 198.61.169.94
d 16 journal.paul.querna.org
p 16 211984
d 4 if-6-1143.tcore1.TV2-Tokyo.as6453.net
p 4 51027
d 5 if-9-2.tcore2.PDI-PaloAlto.as6453.net
p 5 171088
d 6 if-2-2.tcore1.PDI-PaloAlto.as6453.net
p 6 168617
p 7 155310
p 9 204765
d 10 corea.ord1.rackspace.net
p 10 205475
p 0 388
p 11 208450
p 1 301
d 12 core5-aggr1501a-1.ord1.rackspace.net
p 12 205091
d 13 journal.paul.querna.org
p 13 210310
p 2 1160
p 4 50966
p 5 168492
p 6 168517
p 7 155170
p 9 204960
p 10 205695
p 11 208351
p 0 399
p 12 205021
p 1 308
p 13 210262
p 2 44043
h 3 116.0.67.41
p 3 9747
p 4 51271
p 5 168372
p 6 191072
p 7 155448
p 9 204951
p 10 205527
p 11 208545
p 0 400
p 12 205063
p 1 298
p 13 210228
p 2 19220
p 4 53091
p 5 168631
p 6 168492
p 7 184169
p 9 204963
p 10 205488
p 11 208458
```