using proper timer
Merge branch 'vault' of github.com:maidsafe/MaidSafe-Network-Filesystem into vault