alter if else statements around for safety
Merge remote-tracking branch 'fraser/routing_v2' into routing_v2

Conflicts:
	src/maidsafe/routing/routing_table.cc
	src/maidsafe/routing/tests/routing_table_churn_test.cc
	src/maidsafe/routing/tests/routing_table_target_node_group_test.cc
remove some old files
Couple of minor bugfixes and added test library.