style fixes
Merge branch 'issues' into next

Conflicts:
	include/maidsafe/drive/root_handler.h