Bugfixes
merge only
Merge remote-tracking branch 'maidsafe/routing_v2' into routing_v2

Conflicts:
	src/maidsafe/routing/routing_table.cc
Routing table refactored, to complete churn testing
Merge branch 'routing_v2' of github.com:dirvine/MaidSafe-Routing into dirvine-routing_v2

Conflicts:
	include/maidsafe/routing/node_info.h
	src/maidsafe/routing/routing_table.cc
	src/maidsafe/routing/routing_table.h