Merge pull request #72 from dirvine/routing_v2

Routing v2
Compiling on Windows.
Fixed for compiling with Clang on OS X.
Merge pull request #73 from dirvine/routing_v2

Bootstrap handler - to finalise tests and fix addition of multiple entri...
Merge remote-tracking branch 'upstream/routing_v2' into routing_v2

Conflicts:
	CMakeLists.txt
	src/maidsafe/routing/bootstrap_handler.cc
	src/maidsafe/routing/bootstrap_handler.h
Minor updates mainly to BootstrapHandler.
Merge pull request #74 from Fraser999/routing_v2

Routing v2
Fixed segfault in test, but test still failing.
Merge branch 'routing_v2' of github.com:fraser999/MaidSafe-Routing into routing_v2
Added feedback