Some Haskell changes.
Remove Haskell implementation.
Minor polishing.
Neaten figures.
Merge branch 'report-refactor' into report

Conflicts:
	RoutingTable.lhs