Fixes bug that results when caching is disabled.
Merge remote-tracking branch 'origin/refactor' into drive_split

Conflicts:
	include/maidsafe/drive/drive.h
	src/maidsafe/drive/tests/directory_handler_test.cc
	src/maidsafe/drive/tests/drive_api_test.cc