throw proper exception
Fixed race where functor_calls was being incremented by multiple threads without a lock.
Removed duplicated functions.
Merge branch 'next' into remove_matrix

Conflicts:
	src/maidsafe/routing/tests/routing_functional_test.cc