more fixes
Merge branch 'routing_refactor' of github.com:maidsafe/MaidSafe-Network-Filesystem into routing_refactor