Merge branch 'master' of https://github.com/duncanrand/hepix_ipv6

Conflicts:
	chep2013_paper/section-5-ipv6-testing-and-results.tex

Minor fix to the test scenarios text
Merge branch 'master' of https://github.com/prelz/hepix_ipv6