Style fix
Commented Failing test
test
Merge remote-tracking branch 'origin/next' into drive_split

Conflicts:
	src/maidsafe/drive/tests/drive_api_test.cc
Merge branch 'drive_split' of github.com:maidsafe/MaidSafe-Drive into drive_split
Bugfix for directory enumerations.