minor fix / refactoring
Merge branch 'next' of github.com:maidsafe/MaidSafe-Network-Filesystem into next

Conflicts:
	include/maidsafe/nfs/client/maid_node_dispatcher.h