further updates to templated storage, wip
Merge branch 'next' of github.com:maidsafe/MaidSafe-Drive into next