Compiling on Windows.
Fixed for compiling with Clang on OS X.
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